X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Feasymini-v3.0%2FMakefile;fp=src%2Feasymini-v3.0%2FMakefile;h=fa4114fd185d79f355558bd00bb0957cadc7acd9;hp=681c295619e003975a9563ec2e7262a08efe829a;hb=dc4de8365de5829b587a845e0517e8c5fc8c9e29;hpb=ed795c24e6269a10e74b9bc3c385e787bcc230fe

diff --git a/src/easymini-v3.0/Makefile b/src/easymini-v3.0/Makefile
index 681c2956..fa4114fd 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 --output=$@ $(FLASH_PROG) $(PROG)
+
+$(FLASH_PROG): FRC
+	+cd flash-loader && make
+
 $(OBJ): $(INC)
 
 load: $(PROG)
@@ -79,3 +87,5 @@ clean:
 install:
 
 uninstall:
+
+FRC: