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 c145b83b2a8557990416a6e64393e4c0fde40a56..f745e45ed1d16c6794d8bef703bfb19e3018a60d 100644 (file)
--- 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: