From: Keith Packard <keithp@keithp.com>
Date: Mon, 19 Sep 2022 16:20:23 +0000 (-0700)
Subject: easymini-v3.0: Create combined .ihx file for testing
X-Git-Tag: 1.9.12~1^2~23
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=dc4de8365de5829b587a845e0517e8c5fc8c9e29

easymini-v3.0: Create combined .ihx file for testing

This doesn't set the serial number, so it's not useful for production,
but it should at least provide an easy way to check a board.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

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: