X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymini-v2.0%2FMakefile;fp=src%2Feasymini-v2.0%2FMakefile;h=a045e126672d553b60ced4b0f4753803d0d83770;hb=1311eba0bbe32bc1759a3b11b00c78774843383c;hp=a47fc9bd7ac2a2f99a38208cf31a25b3a373f9c4;hpb=7b2588ee723827b9be2a2d5f287afb1b5d351b23;p=fw%2Faltos

diff --git a/src/easymini-v2.0/Makefile b/src/easymini-v2.0/Makefile
index a47fc9bd..a045e126 100644
--- a/src/easymini-v2.0/Makefile
+++ b/src/easymini-v2.0/Makefile
@@ -58,15 +58,25 @@ CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS)
 PROGNAME=easymini-v2.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+FLASH_PROG=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf
+BOTH_DFU=$(PROGNAME)-combined-$(VERSION).dfu
+
+MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin
 
 SRC=$(ALTOS_SRC) ao_easymini.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BOTH_DFU)
 
 $(PROG): Makefile $(OBJ)
 	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
+$(BOTH_DFU): $(PROG) $(FLASH_PROG)
+	$(MAKEBIN) --dfu --output=$@ --base=$(FLASH_ADDR) $(FLASH_PROG) $(PROG)
+
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
+
 $(OBJ): $(INC)
 
 distclean:	clean
@@ -78,3 +88,5 @@ clean:
 install:
 
 uninstall:
+
+FRC: