X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasytimer-v2%2FMakefile;h=32b9117a7d0c170a9ea128bca1f3fb99462f2119;hb=d7a91278051ff75e3edc3e999a6d8096fa4deec4;hp=66c31e0b8107dfb02dabfd4c435a09ea54590b9a;hpb=d69b6738040bf751d024b4daceace7aedee6f7c7;p=fw%2Faltos

diff --git a/src/easytimer-v2/Makefile b/src/easytimer-v2/Makefile
index 66c31e0b..32b9117a 100644
--- a/src/easytimer-v2/Makefile
+++ b/src/easytimer-v2/Makefile
@@ -62,7 +62,7 @@ ALTOS_SRC = \
 	$(SAMPLE_PROFILE) \
 	$(STACK_GUARD)
 
-PRODUCT=EasyTimer-2
+PRODUCT=EasyTimer-v2
 PRODUCT_DEF=-DEASYTIMER_V_2
 IDPRODUCT=0x000d
 
@@ -71,17 +71,30 @@ CFLAGS = $(PRODUCT_DEF) $(SAMD21_CFLAGS) $(PROFILE_DEF) $(SAMPLE_PROFILE_DEF) $(
 PROGNAME=easytimer-v2
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+FLASH_PROG=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf
+BOTH_HEX=$(PROGNAME)-combined-$(VERSION).ihx
+
+ELFTOHEX=$(TOPDIR)/../ao-tools/ao-elftohex/ao-elftohex
 
 SRC=$(ALTOS_SRC) ao_easytimer.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BOTH_HEX)
 
 $(PROG): Makefile $(OBJ)
 	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
+$(BOTH_HEX): $(PROG) $(FLASH_PROG)
+	$(ELFTOHEX) --nosym --output=$@ $(FLASH_PROG) $(PROG)
+
 $(OBJ): $(INC)
 
+
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
+
+FRC:
+
 distclean:	clean
 
 clean: