From f16c0b19ea38b619b1bc74004356326adabfc406 Mon Sep 17 00:00:00 2001
From: Dan Green <danngreen1@gmail.com>
Date: Wed, 19 Jun 2024 15:33:28 -0700
Subject: [PATCH] Target for making mp2 fsbl header

---
 Makefile       | 4 ++++
 fsbl_header.py | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 26e56ad..4da4ba6 100644
--- a/Makefile
+++ b/Makefile
@@ -138,6 +138,10 @@ image: $(BIN)
 	python3 fsbl_header.py $(BUILDDIR)/$(BINARYNAME).bin $(BUILDDIR)/$(BINARYNAME).stm32
 	@ls -l $(BUILDDIR)/$(BINARYNAME).stm32
 
+image-mp2: $(BIN)
+	python3 fsbl_header.py --format=mp2 $(BUILDDIR)/$(BINARYNAME).bin $(BUILDDIR)/$(BINARYNAME).stm32
+	@ls -l $(BUILDDIR)/$(BINARYNAME).stm32
+
 load: image
 	@read -p "What is the disk device (Enter for $(SD_DISK_DEV)): " DISK && \
 	DISK=$${DISK:-$(SD_DISK_DEV)} && \
diff --git a/fsbl_header.py b/fsbl_header.py
index 57439aa..1658270 100755
--- a/fsbl_header.py
+++ b/fsbl_header.py
@@ -11,14 +11,14 @@ def add_mp2_fsbl_header(binary_file):
 
     payload = bytearray(binary_file[0x100:])
 
-    header = struct.pack("<ccccQQQQQQQQIIIIQQQIIII8xII",
+    header = struct.pack("<ccccQQQQQQQQIIIIIIIIIII8xII",
         bytes('S', "ascii"), bytes('T', "ascii"), bytes('M', "ascii"), bytes('2', "ascii"), # Header magic
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,                                     # ECDSA signature (512bits=64Bytes=8 quads), unsigned here
         sum(payload),                                                                       # Checksum of payload, sum of all bytes
         0x00020200,                                                                         # Header version 1.0
         len(payload),                                                                       # Length of payload
         0x2FFC0000 + 0x2400 + 0x100,                                                        # Entrypoint address. ????
-        0x00000000, 0x00000000, 0x00000000,                                                 # Reserved (96 bits = 3 quads)
+        0x00, 0x00, 0x00,                                                                   # Reserved (96 bits = 3 quads)
         0x00000000,                                                                         # Image version (32bits)
         0x00000000,                                                                         # Option flags (32bits) , header padding disabled, auth disabled, decrypt disabled
         0x00000000,                                                                         # Header extension lengths (32bits)