X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymini-v3.0%2FMakefile;h=81be85f46869ec41260c9ec26ce6c35efcbe5a7e;hb=4da8e047c4df06a0fec2c0cd47d26d5f1bef0e31;hp=681c295619e003975a9563ec2e7262a08efe829a;hpb=d2ec815a17e9327414bab7ea09ed483c4f47f460;p=fw%2Faltos

diff --git a/src/easymini-v3.0/Makefile b/src/easymini-v3.0/Makefile
index 681c2956..81be85f4 100644
--- a/src/easymini-v3.0/Makefile
+++ b/src/easymini-v3.0/Makefile
@@ -56,15 +56,23 @@ CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS)
 PROGNAME=easymini-v3.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+FLASH_PROG=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf
+BOTH_HEX=$(PROGNAME)-combined-$(VERSION).ihx
 
 SRC=$(ALTOS_SRC) ao_easymini.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BOTH_HEX)
 
 $(PROG): Makefile $(OBJ) altos.ld
 	$(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
+$(BOTH_HEX): $(PROG) $(FLASH_PROG)
+	../../ao-tools/ao-elftohex/ao-elftohex -n --output=$@ $(FLASH_PROG) $(PROG)
+
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
+
 $(OBJ): $(INC)
 
 load: $(PROG)
@@ -79,3 +87,5 @@ clean:
 install:
 
 uninstall:
+
+FRC: