From 9cd14efb76a4ddbcd013f44d50dc1ff93d56c4ca Mon Sep 17 00:00:00 2001
From: Thomas Albers Raviola <thomas@thomaslabs.org>
Date: Mon, 2 Dec 2024 21:43:04 +0100
Subject: Move bootloader to payload

---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 9311c3e..b1b2c0d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,7 @@ CPP=sdcpp
 ASM=crt0.asm\
 	isr.asm\
 	delay.asm
-SRC=crc16.c\
-	bootloader.c\
-	font.c\
+SRC=font.c\
 	i2c.c\
 	input.c\
 	main.c\
@@ -22,6 +20,7 @@ OBJ=$(ASM:%.asm=build/%.rel)\
 
 IHX=build/$(PROJECT).ihx
 TARGET=build/$(PROJECT).hex
+BOOTLOADER=build/boot/bootloader.hex
 
 INCLUDE=include
 CFLAGS=-mz80 -I$(INCLUDE) --Werror
@@ -53,8 +52,12 @@ $(IHX) : $(OBJ)
 	@echo '  (LD)' $(OBJ)
 	@$(CC) $(LDFLAGS) -o $@ $(OBJ)
 
-$(TARGET) : $(IHX)
-	@hex2bin.py $< $@
+$(TARGET) : $(IHX) $(BOOTLOADER)
+	@hex2bin.py -l 32768 $< $@
+	@dd if=$(BOOTLOADER) of=$@ obs=1024 seek=28 conv=notrunc
+
+$(BOOTLOADER) :
+	make -C boot
 
 .PHONE : flash
 flash :
-- 
cgit v1.2.3