altos: Fix flash loader map file names

Make sure these include the product name too.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/lpc/Makefile-flash.defs b/src/lpc/Makefile-flash.defs
index 1ae94c1548bef0c9261a25dde823fce1bb18ca6f..3965919515eeddc6d4f78a62eecf82bcb4f33cb7 100644 (file)
--- a/src/lpc/Makefile-flash.defs
+++ b/src/lpc/Makefile-flash.defs
@@ -37,8 +37,8 @@ CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS)
 
 LDFLAGS=-nostartfiles $(CFLAGS) -L$(TOPDIR)/lpc -Taltos-loader.ld
 
-PROGNAME=altos-flash
-PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf
+PROGNAME=$(HARDWARE)-altos-flash
+PROG=$(PROGNAME)-$(VERSION).elf
 
 $(PROG): Makefile $(OBJ) altos-loader.ld
        $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
@@ -50,7 +50,7 @@ all: $(PROG)
 distclean:     clean
 
 clean:
-       rm -f *.o $(HARDWARE)-$(PROGNAME)-*.elf
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.map
        rm -f ao_product.h
 
 install:

diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs
index 4a3864318eb342c85d849fd17dd9b991f385f15e..37fad6d1638b5e59d0bfd9c8712c93986ee0c492 100644 (file)
--- a/src/stm/Makefile-flash.defs
+++ b/src/stm/Makefile-flash.defs
@@ -37,8 +37,8 @@ CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS)
 
 LDFLAGS=-nostartfiles $(CFLAGS) -L$(TOPDIR)/stm -Taltos-loader.ld -n
 
-PROGNAME=altos-flash
-PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf
+PROGNAME=$(HARDWARE)-altos-flash
+PROG=$(PROGNAME)-$(VERSION).elf
 
 $(PROG): Makefile $(OBJ) altos-loader.ld
        $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
@@ -50,7 +50,7 @@ all: $(PROG)
 distclean:     clean
 
 clean:
-       rm -f *.o $(HARDWARE)-$(PROGNAME)-*.elf
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.map
        rm -f ao_product.h
 
 install:

diff --git a/src/stm32f4/Makefile-flash.defs b/src/stm32f4/Makefile-flash.defs
index bc5aa1acb3c4eb24dc40ba236bc7da584c2cec84..51702d526ddeccbcc990dc7ca4cf160a78bd9441 100644 (file)
--- a/src/stm32f4/Makefile-flash.defs
+++ b/src/stm32f4/Makefile-flash.defs
@@ -37,9 +37,9 @@ CFLAGS = $(PRODUCT_DEF) $(STM32F4_CFLAGS)
 
 LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm32f4 -Wl,-Taltos-loader.ld
 
-PROGNAME=altos-flash
-PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf
-BIN=$(HARDWARE)-$(PROGNAME)-$(VERSION).bin
+PROGNAME=$(HARDWARE)-altos-flash
+PROG=$(PROGNAME)-$(VERSION).elf
+BIN=$(PROGNAME)-$(VERSION).bin
 
 MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin
 FLASH_ADDR=0x08000000
@@ -57,7 +57,7 @@ $(OBJ): $(INC)
 distclean:     clean
 
 clean:
-       rm -f *.o $(HARDWARE)-$(PROGNAME)-*.elf $(HARDWARE)-$(PROGNAME)-*.bin
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.bin $(PROGNAME)-*.map
        rm -f ao_product.h
 
 install:

diff --git a/src/stm32l0/Makefile-flash.defs b/src/stm32l0/Makefile-flash.defs
index 08a4b1773e00be742ac16856a883402d7e4f16b3..83aff3c51390810c68ff7e53fd70e1a36ae3cf59 100644 (file)
--- a/src/stm32l0/Makefile-flash.defs
+++ b/src/stm32l0/Makefile-flash.defs
@@ -37,8 +37,8 @@ CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS)
 
 LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm -Wl,-Taltos-loader.ld -n
 
-PROGNAME=altos-flash
-PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf
+PROGNAME=$(HARDWARE)-altos-flash
+PROG=$(PROGNAME)-$(VERSION).elf
 
 $(PROG): Makefile $(OBJ) altos-loader.ld
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
@@ -50,7 +50,7 @@ all: $(PROG)
 distclean:     clean
 
 clean:
-       rm -f *.o $(HARDWARE)-$(PROGNAME)-*.elf
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.map
        rm -f ao_product.h
 
 install:

diff --git a/src/stmf0/Makefile-flash.defs b/src/stmf0/Makefile-flash.defs
index bbb04e77c1292669b8210b6297b903321dcf6998..07e1cb3bc96331d4dd5083d20e402b9f6ee7975f 100644 (file)
--- a/src/stmf0/Makefile-flash.defs
+++ b/src/stmf0/Makefile-flash.defs
@@ -37,9 +37,9 @@ CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS)
 
 LDFLAGS=-nostartfiles $(CFLAGS) -L$(TOPDIR)/stmf0 -Taltos-loader.ld
 
-PROGNAME=altos-flash
-PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf
-BIN=$(HARDWARE)-$(PROGNAME)-$(VERSION).bin
+PROGNAME=$(HARDWARE)-altos-flash
+PROG=$(PROGNAME)-$(VERSION).elf
+BIN=$(PROGNAME)-$(VERSION).bin
 
 MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin
 FLASH_ADDR=0x08000000
@@ -57,7 +57,7 @@ $(OBJ): $(INC)
 distclean:     clean
 
 clean:
-       rm -f *.o $(HARDWARE)-$(PROGNAME)-*.elf $(HARDWARE)-$(PROGNAME)-*.bin
+       rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.bin $(PROGNAME)-*.map
        rm -f ao_product.h
 
 install: