Merge branch 'master' into lpc55s69

Author: twcook86

.github/workflows/trustzone-emulator-tests.yml

@@ -8,7 +8,7 @@ jobs:
   trustzone-emulator-tests:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/danielinux/m33mu-ci:1.3
+      image: ghcr.io/danielinux/m33mu-ci:1.5
     steps:
       - uses: actions/checkout@v4
 

Makefile

@@ -202,7 +202,9 @@ endif
 
 # Environment variables for sign tool
 SIGN_ENV=IMAGE_HEADER_SIZE=$(IMAGE_HEADER_SIZE) \
+		 WOLFBOOT_PARTITION_SIZE=$(WOLFBOOT_PARTITION_SIZE) \
 		 WOLFBOOT_SECTOR_SIZE=$(WOLFBOOT_SECTOR_SIZE) \
+		 NVM_FLASH_WRITEONCE=$(NVM_FLASH_WRITEONCE) \
 		 ML_DSA_LEVEL=$(ML_DSA_LEVEL) \
 		 IMAGE_SIGNATURE_SIZE=$(IMAGE_SIGNATURE_SIZE) \
 		 LMS_LEVELS=$(LMS_LEVELS) \
@@ -604,6 +606,7 @@ include/target.h: $(TARGET_H_TEMPLATE) FORCE
 	sed -e "s/@WOLFBOOT_DTS_UPDATE_ADDRESS@/$(WOLFBOOT_DTS_UPDATE_ADDRESS)/g" | \
 	sed -e "s/@WOLFBOOT_LOAD_ADDRESS@/$(WOLFBOOT_LOAD_ADDRESS)/g" | \
 	sed -e "s/@WOLFBOOT_LOAD_DTS_ADDRESS@/$(WOLFBOOT_LOAD_DTS_ADDRESS)/g" | \
+	sed -e "s/@WOLFBOOT_RAMBOOT_MAX_SIZE@/$(WOLFBOOT_RAMBOOT_MAX_SIZE)/g" | \
 	sed -e "s/@WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS@/$(WOLFBOOT_PARTITION_SELF_HEADER_ADDRESS)/g" \
 		> $@
 

arch.mk

@@ -1398,7 +1398,6 @@ ifeq ($(ARCH), AURIX_TC3)
   # TC3xx specific
   ifeq ($(TARGET), aurix_tc3xx)
     USE_GCC?=1
-    ARCH_FLASH_OFFSET=0x00000000
 
     CFLAGS += -I$(TC3_DIR) -Ihal
 
@@ -1444,6 +1443,7 @@ ifeq ($(ARCH), AURIX_TC3)
     endif
 
     ifeq ($(AURIX_TC3_HSM),1)
+      ARCH_FLASH_OFFSET=0x80028000
       # HSM compiler flags, build options, source code, etc
       ifeq ($(USE_GCC),1)
         # Just arm-none-eabi-gcc for now
@@ -1512,6 +1512,7 @@ ifeq ($(ARCH), AURIX_TC3)
 
     else
       # Tricore compiler settings
+      ARCH_FLASH_OFFSET=0x800A0000
       ifeq ($(USE_GCC),1)
         HT_ROOT?=/opt/hightec/gnutri_v4.9.4.1-11fcedf-lin64
         CROSS_COMPILE?=$(HT_ROOT)/bin/tricore-

config/examples/polarfire_mpfs250.config

@@ -62,6 +62,7 @@ WOLFBOOT_LOAD_ADDRESS?=0x8E000000
 # Partition layout for PolarFire SoC MPFS250T
 # Using update_disk loader we just need to specify the partition number or A/B
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x80000000
 CFLAGS_EXTRA+=-DBOOT_PART_A=1
 CFLAGS_EXTRA+=-DBOOT_PART_B=2
 # Speed up disk partition read (512KB chunks - max DMA size)

config/examples/raspi3-encrypted.config

@@ -10,6 +10,7 @@ PKA?=0
 WOLFTPM?=0
 
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x20000000
 WOLFBOOT_PARTITION_BOOT_ADDRESS=0x140000
 WOLFBOOT_PARTITION_UPDATE_ADDRESS=0x1140000
 WOLFBOOT_PARTITION_SWAP_ADDRESS=0xFFFFFFFF

config/examples/raspi3.config

@@ -13,5 +13,6 @@ NO_XIP?=1
 NO_QNX?=1
 WOLFBOOT_SECTOR_SIZE=0x400
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x20000000
 WOLFBOOT_LOAD_ADDRESS?=0x3080000
 WOLFBOOT_LOAD_DTS_ADDRESS?=0x400000

config/examples/versal_vmk180_sdcard.config

@@ -66,6 +66,7 @@ CROSS_COMPILE=aarch64-none-elf-
 # These are 0-based indices into the parsed partition array:
 #   part[0]=boot, part[1]=OFP_A, part[2]=OFP_B, part[3]=rootfs
 WOLFBOOT_NO_PARTITIONS=1
+WOLFBOOT_RAMBOOT_MAX_SIZE=0x80000000
 CFLAGS_EXTRA+=-DBOOT_PART_A=1
 CFLAGS_EXTRA+=-DBOOT_PART_B=2
 

config/examples/vorago_va416x0.config

@@ -33,7 +33,7 @@ DUALBANK_SWAP?=0
 PKA?=0
 ENCRYPT=0
 WOLFTPM?=0
-OPTIMIZATION_LEVEL=1
+OPTIMIZATION_LEVEL=s
 
 # Optionally allow downgrade to older valid version in update partition
 ALLOW_DOWNGRADE?=0
@@ -45,11 +45,11 @@ NO_ARM_ASM?=0
 # Optional: Use smaller SHA512
 #CFLAGS_EXTRA+=-DUSE_SLOW_SHA512
 
-# 38KB boot, 108KB partitions, 2KB swap
+# Optimized: 46KB wolfboot, 104KB partitions, 2KB swap
 WOLFBOOT_SECTOR_SIZE?=0x800
-WOLFBOOT_PARTITION_SIZE?=0x1B000
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x9800
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x24800
+WOLFBOOT_PARTITION_SIZE?=0x1A000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xB800
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x25800
 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x3F800
 
 # ML-DSA 5: 36KB boot, 96KB partitions, 12KB swap
@@ -81,3 +81,9 @@ WOLFBOOT_RESTORE_CLOCK?=1
 # Optional debugging
 #CFLAGS_EXTRA+=-DDEBUG_EXT_FLASH
 #CFLAGS_EXTRA+=-DTEST_EXT_FLASH
+
+# Optional: Enable wolfCrypt test and benchmark in test-app
+# Uncomment to enable
+# Note: Requires ~80-160KB additional flash and ~10-20KB RAM
+#WOLFCRYPT_TEST?=1
+#WOLFCRYPT_BENCHMARK?=1

hal/aurix_tc3xx.c

@@ -348,9 +348,13 @@ void do_boot(const uint32_t* app_offset)
 }
 #endif
 
-void arch_reboot(void)
+RAMFUNCTION void arch_reboot(void)
 {
+#ifdef WOLFBOOT_AURIX_TC3XX_HSM
+    tc3arm_HsmBridgeSysReset();
+#else
     tc3_Scu_TriggerSwReset(1, WOLFBOOT_AURIX_RESET_REASON);
+#endif
 }
 
 /* Programs unaligned input data to flash, assuming the underlying memory is
@@ -612,15 +616,15 @@ int RAMFUNCTION hal_flash_erase(uint32_t address, int len)
 /* If the IAP interface of the flash memory of the target requires it, this
  * function is called before every write and erase operations to unlock write
  * access to the flash. On some targets, this function may be empty. */
-void hal_flash_unlock(void) {}
+RAMFUNCTION void hal_flash_unlock(void) {}
 
 /* If the IAP interface of the flash memory requires locking/unlocking, this
  * function restores the flash write protection by excluding write accesses.
  * This function is called by the bootloader at the end of every write and erase
  * operations. */
-void hal_flash_lock(void) {}
+RAMFUNCTION void hal_flash_lock(void) {}
 
-int ext_flash_write(uintptr_t address, const uint8_t* data, int len)
+RAMFUNCTION int ext_flash_write(uintptr_t address, const uint8_t* data, int len)
 {
     return hal_flash_write(address, data, len);
 }
@@ -685,17 +689,17 @@ int RAMFUNCTION ext_flash_read(uintptr_t address, uint8_t* data, int len)
     return 0;
 }
 
-int ext_flash_erase(uintptr_t address, int len)
+RAMFUNCTION int ext_flash_erase(uintptr_t address, int len)
 {
     return hal_flash_erase(address, len);
 }
 
-void ext_flash_lock(void)
+RAMFUNCTION void ext_flash_lock(void)
 {
     hal_flash_lock();
 }
 
-void ext_flash_unlock(void)
+RAMFUNCTION void ext_flash_unlock(void)
 {
     hal_flash_unlock();
 }

include/target.h.in

@@ -116,6 +116,9 @@
 /* Load address in RAM for staged OS (update_ram only) */
 #define WOLFBOOT_LOAD_ADDRESS                 @WOLFBOOT_LOAD_ADDRESS@
 #endif
+
+/* Optional RAM-boot image size cap for targets without partitions */
+#define WOLFBOOT_RAMBOOT_MAX_SIZE             @WOLFBOOT_RAMBOOT_MAX_SIZE@
 #define WOLFBOOT_LOAD_DTS_ADDRESS             @WOLFBOOT_LOAD_DTS_ADDRESS@