From 2a6c0e80f64e793b68e29a18fafad730b55a06b6 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 29 Sep 2020 23:58:10 -0700
Subject: [PATCH] altos: Fix flash loader map file names

Make sure these include the product name too.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/lpc/Makefile-flash.defs     | 6 +++---
 src/stm/Makefile-flash.defs     | 6 +++---
 src/stm32f4/Makefile-flash.defs | 8 ++++----
 src/stm32l0/Makefile-flash.defs | 6 +++---
 src/stmf0/Makefile-flash.defs   | 8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/lpc/Makefile-flash.defs b/src/lpc/Makefile-flash.defs
index 1ae94c15..39659195 100644
--- 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 4a386431..37fad6d1 100644
--- 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 bc5aa1ac..51702d52 100644
--- 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 08a4b177..83aff3c5 100644
--- 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 bbb04e77..07e1cb3b 100644
--- 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:
-- 
2.30.2