X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymini-v2.0%2FMakefile;h=a045e126672d553b60ced4b0f4753803d0d83770;hb=HEAD;hp=9b4cc6d7da4370364da02b8e474cf7dd9f3a4b5c;hpb=41d5bb89973c7a358d08c538f1b52c45b0bbec30;p=fw%2Faltos

diff --git a/src/easymini-v2.0/Makefile b/src/easymini-v2.0/Makefile
index 9b4cc6d7..ac4f9c4b 100644
--- a/src/easymini-v2.0/Makefile
+++ b/src/easymini-v2.0/Makefile
@@ -53,31 +53,41 @@ PRODUCT=EasyMini-v2.0
 PRODUCT_DEF=-DEASYMINI_V_2_0
 IDPRODUCT=0x0026
 
-CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os
+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) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
+
+$(BOTH_DFU): $(PROG) $(FLASH_PROG)
+	$(MAKEBIN) --dfu --output=$@ --base=$(FLASH_ADDR) $(FLASH_PROG) $(PROG)
 
-ao_product.h: ao-make-product.5c ../Version
-	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
 
 $(OBJ): $(INC)
 
 distclean:	clean
 
 clean:
-	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx
+	rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx $(PROGNAME)-*.map
+	rm -f $(PROGNAME)-*.dfu
 	rm -f ao_product.h
 
 install:
 
 uninstall:
+
+FRC: