chaoskey: Create unified ROM image with both loader and app

Flash the whole thing all at once to reduce the number of steps during
turnon.

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

diff --git a/ao-bringup/turnon_chaoskey b/ao-bringup/turnon_chaoskey
index 4a255bff3d27581e1070641c5cf1f59d79ab7243..d710e5ff19a89fda20da27b6f86c47372cf4f137 100755 (executable)
--- a/ao-bringup/turnon_chaoskey
+++ b/ao-bringup/turnon_chaoskey
@@ -24,14 +24,14 @@ echo "Expectations:"
 echo "\tChaosKey v$VERSION powered from USB"
 echo
 
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/chaoskey-v1.0-altos-flash-*.bin
-ALTOS_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-*.elf
+FLASH_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-all-*.bin
+#ALTOS_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-*.elf
 
 $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || true
 
-sleep 2
+#sleep 2
 
-$USBLOAD --serial=1 $ALTOS_FILE || exit 1
+#$USBLOAD --serial=1 $ALTOS_FILE || exit 1
 
 sleep 1
 

diff --git a/src/chaoskey-v1.0/Makefile b/src/chaoskey-v1.0/Makefile
index f2c168baf3cf1a99f3fe7cc55b5c9b1aaf01e1aa..dea5b483f5158e719cf63dcf0d49c018f5e67fef 100644 (file)
--- a/src/chaoskey-v1.0/Makefile
+++ b/src/chaoskey-v1.0/Makefile
@@ -51,12 +51,13 @@ CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os
 PROGNAME=chaoskey-v1.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+BIN=$(PROGNAME)-all-$(VERSION).bin
 METAINFO=org.altusmetrum.ChaosKey.metainfo.xml
 
 SRC=$(ALTOS_SRC) ao_chaoskey.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BIN)
 
 $(PROG): Makefile $(OBJ) altos.ld
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
@@ -66,6 +67,12 @@ ao_product.h: ao-make-product.5c ../Version
 
 $(OBJ): $(INC)
 
+$(BIN): $(PROG) $(LOADER)
+       $(MAKEBIN) --output=$@ --base=$(FLASH_ADDR) $(LOADER) $(PROG)
+
+$(LOADER):
+       +cd flash-loader && make
+
 %.cab: $(PROG) $(HEX) $(METAINFO)
        gcab --create --nopath $@ $(PROG) $(HEX) $(METAINFO)