From 3735e1eb27afb873d60164a79a9e2769dc92b3a3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 24 Sep 2022 15:54:20 -0700
Subject: [PATCH] easymini: Elide symbols from combined .ihx file

Also add combined hex file to easymini v1.0 for testing.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/easymini-v1.0/Makefile | 12 +++++++++++-
 src/easymini-v3.0/Makefile |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/easymini-v1.0/Makefile b/src/easymini-v1.0/Makefile
index e146f54a..755de1f0 100644
--- a/src/easymini-v1.0/Makefile
+++ b/src/easymini-v1.0/Makefile
@@ -56,15 +56,25 @@ CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS)
 PROGNAME=easymini-v1.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
+
+FRC:
+
 $(OBJ): $(INC)
 
 load: $(PROG)
diff --git a/src/easymini-v3.0/Makefile b/src/easymini-v3.0/Makefile
index fa4114fd..81be85f4 100644
--- a/src/easymini-v3.0/Makefile
+++ b/src/easymini-v3.0/Makefile
@@ -68,7 +68,7 @@ $(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)
+	../../ao-tools/ao-elftohex/ao-elftohex -n --output=$@ $(FLASH_PROG) $(PROG)
 
 $(FLASH_PROG): FRC
 	+cd flash-loader && make
-- 
2.30.2