add ci test coverage for monolithic and self-update combined cases

Author: bigbrett

.github/workflows/test-sim-self-update.yml

@@ -32,6 +32,12 @@ jobs:
           cp config/examples/sim-self-update-ext.config .config
           make test-sim-self-update-ext
 
+      - name: Run monolithic self-update test
+        run: |
+          make clean
+          cp config/examples/sim-self-update-monolithic.config .config
+          make test-sim-self-update-monolithic
+
       - name: Run self-header verification test (internal flash)
         run: |
           make clean
@@ -43,3 +49,10 @@ jobs:
           make clean
           cp config/examples/sim-self-header-ext.config .config
           make test-sim-self-header-ext-verify
+
+      - name: Run combined monolithic self-update + self-header test
+        run: |
+          make clean
+          cp config/examples/sim-self-update-monolithic.config .config
+          make test-sim-self-update-monolithic-self-header WOLFBOOT_SELF_HEADER=1 WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS=0x1F000
+

config/examples/sim-self-update-monolithic.config

@@ -9,11 +9,12 @@ RAM_CODE=1
 SELF_UPDATE_MONOLITHIC=1
 WOLFBOOT_VERSION=1
 
-# sizes should be multiple of system page size
-WOLFBOOT_PARTITION_SIZE=0x40000
+# Partition size 512KB so the monolithic payload (bootloader region + app)
+# fits in the UPDATE partition.
+WOLFBOOT_PARTITION_SIZE=0x80000
 WOLFBOOT_SECTOR_SIZE=0x1000
 WOLFBOOT_PARTITION_BOOT_ADDRESS=0x20000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x60000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS=0xA0000
 
 # required for keytools
 WOLFBOOT_FIXED_PARTITIONS=1

tools/test.mk

@@ -300,6 +300,49 @@ test-sim-self-update-monolithic: wolfboot.bin test-app/image_v1_signed.bin FORCE
 	@echo "  Nested app at boot partition: PASSED"
 	@echo "=== Monolithic Self-Update Test PASSED ==="
 
+# Test monolithic self-update with self-header persistence.
+# Same as test-sim-self-update-monolithic, but also verifies that the
+# self-header was persisted at WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS and
+# matches the signing tool's --header-only output byte-for-byte.
+#
+test-sim-self-update-monolithic-self-header: wolfboot.bin test-app/image_v1_signed.bin FORCE
+	@echo "=== Simulator Monolithic Self-Update + Self-Header Test ==="
+	@# Create dummy bootloader (0xAA pattern, exactly bootloader region size)
+	$(Q)dd if=/dev/zero bs=$$(($(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLASH_OFFSET))) count=1 2>/dev/null | tr '\000' '\252' > monolithic_dummy_bl.bin
+	@# Concatenate dummy bootloader + signed app image to form monolithic payload
+	$(Q)cat monolithic_dummy_bl.bin test-app/image_v1_signed.bin > monolithic_payload.bin
+	@# Sign monolithic payload as wolfBoot self-update v2, and generate header-only
+	$(Q)$(SIGN_ENV) $(SIGN_TOOL) $(SIGN_OPTIONS) --wolfboot-update monolithic_payload.bin $(PRIVATE_KEY) 2
+	$(Q)$(SIGN_ENV) $(SIGN_TOOL) $(SIGN_OPTIONS) --wolfboot-update --header-only monolithic_payload.bin $(PRIVATE_KEY) 2
+	@# Create update partition with signed monolithic image and "pBOOT" trailer
+	$(Q)dd if=/dev/zero bs=$$(($(WOLFBOOT_PARTITION_SIZE))) count=1 2>/dev/null | tr '\000' '\377' > update_part.dd
+	$(Q)dd if=monolithic_payload_v2_signed.bin of=update_part.dd bs=1 conv=notrunc
+	$(Q)printf "pBOOT" | dd of=update_part.dd bs=1 seek=$$(($(WOLFBOOT_PARTITION_SIZE) - 5)) conv=notrunc
+	@# Create erased boot partition and self-header sector
+	$(Q)dd if=/dev/zero bs=$$(($(WOLFBOOT_PARTITION_SIZE))) count=1 2>/dev/null | tr '\000' '\377' > boot_part.dd
+	$(Q)dd if=/dev/zero bs=$$(($(WOLFBOOT_SECTOR_SIZE))) count=1 2>/dev/null | tr '\000' '\377' > self_hdr.dd
+	@# Assemble flash: wolfboot.bin at 0, erased self-header, empty boot partition, update partition
+	$(Q)$(BINASSEMBLE) internal_flash.dd \
+		0 wolfboot.bin \
+		$$(($(WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS) - $(ARCH_FLASH_OFFSET))) self_hdr.dd \
+		$$(($(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLASH_OFFSET))) boot_part.dd \
+		$$(($(WOLFBOOT_PARTITION_UPDATE_ADDRESS) - $(ARCH_FLASH_OFFSET))) update_part.dd
+	@# Run simulator - self-update fires, copies monolithic payload to offset 0 and persists header
+	$(Q)./wolfboot.elf get_version || true
+	@# Verify bootloader region up to self-header contains 0xAA pattern
+	@# (the self-header sector itself is overwritten by wolfBoot_update_self_header)
+	$(Q)cmp -n $$(($(WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS) - $(ARCH_FLASH_OFFSET))) monolithic_dummy_bl.bin internal_flash.dd
+	@echo "  Bootloader region 0xAA pattern: PASSED"
+	@# Extract nested app from boot partition and verify it matches original signed app
+	$(Q)dd if=internal_flash.dd bs=1 skip=$$(($(WOLFBOOT_PARTITION_BOOT_ADDRESS) - $(ARCH_FLASH_OFFSET))) count=$$(wc -c < test-app/image_v1_signed.bin | awk '{print $$1}') of=nested_app.dd 2>/dev/null
+	$(Q)cmp nested_app.dd test-app/image_v1_signed.bin
+	@echo "  Nested app at boot partition: PASSED"
+	@# Extract persisted self-header and verify it matches --header-only output
+	$(Q)dd if=internal_flash.dd bs=1 skip=$$(($(WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS) - $(ARCH_FLASH_OFFSET))) count=$$(($(WOLFBOOT_SECTOR_SIZE))) of=persisted_hdr.dd 2>/dev/null
+	$(Q)cmp -n $$(($(IMAGE_HEADER_SIZE))) persisted_hdr.dd monolithic_payload_v2_header.bin
+	@echo "  Self-header persisted correctly: PASSED"
+	@echo "=== Monolithic Self-Update + Self-Header Test PASSED ==="
+
 # Test self-header cryptographic verification (hash + signature validation)
 #
 # Verifies that an application can cryptographically verify the bootloader using