From: Keith Packard <keithp@keithp.com>
Date: Tue, 21 May 2024 04:22:33 +0000 (-0700)
Subject: altos/easymega-v3.0: Add combined dfu and ihx targets
X-Git-Tag: 1.9.19~1^2~23
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=bf1e38a6f085c630cf56c3da44fc6d4eb232e373;p=fw%2Faltos

altos/easymega-v3.0: Add combined dfu and ihx targets

Build these for testing the boards at Seeed

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

diff --git a/src/easymega-v3.0/Makefile b/src/easymega-v3.0/Makefile
index c145b83b..f745e45e 100644
--- a/src/easymega-v3.0/Makefile
+++ b/src/easymega-v3.0/Makefile
@@ -84,17 +84,33 @@ CFLAGS = $(PRODUCT_DEF) $(STM32F1_CFLAGS)
 PROGNAME=easymega-v3.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+FLASH_PROG=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf
+BOTH_DFU=$(PROGNAME)-combined-$(VERSION).dfu
+BOTH_HEX=$(PROGNAME)-combined-$(VERSION).ihx
+ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex
+MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin
 
 SRC=$(ALTOS_SRC) ao_easymega.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BOTH_DFU) $(BOTH_HEX)
 
 $(PROG): Makefile $(OBJ) altos.ld
 	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
+$(BOTH_DFU): $(PROG) $(FLASH_PROG)
+	$(MAKEBIN) --dfu --output=$@ --base=$(FLASH_ADDR) $(FLASH_PROG) $(PROG)
+
+$(BOTH_HEX): $(PROG) $(FLASH_PROG)
+	$(ELFTOHEX) --nosym --output=$@ $(FLASH_PROG) $(PROG)
+
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
+
 $(OBJ): $(INC)
 
+FRC:
+
 distclean:	clean
 
 clean: