Merge pull request #733 from mattia-moffa/20260319-remove-ram-kv-partition

Remove RAM_KV partition; remove flash keyvault when not needed

Author: dgarske

config/examples/mcxw-tz.config

@@ -31,23 +31,23 @@ PKA?=1
 WOLFBOOT_SECTOR_SIZE?=0x2000
 
 # Default configuration
-# 32KB boot, 80KB keyvault, 16KB NSC, 60KB partitions, 8KB swap
+# 32KB boot, no keyvault, 16KB NSC, 64KB partitions, 8KB swap
 WOLFBOOT_KEYVAULT_ADDRESS?=0x8000
-WOLFBOOT_KEYVAULT_SIZE?=0x14000
-WOLFBOOT_NSC_ADDRESS?=0x1C000
+WOLFBOOT_KEYVAULT_SIZE?=0
+WOLFBOOT_NSC_ADDRESS?=0x8000
 WOLFBOOT_NSC_SIZE?=0x4000
-WOLFBOOT_PARTITION_SIZE?=0xF000
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x2F000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x3E000
+WOLFBOOT_PARTITION_SIZE?=0x10000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x0C000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x1C000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x2C000
 
 # Alternate larger configuration for debugging or ARMASM
-# 40KB boot, 80KB keyvault, 8KB NSC, 60KB partitions, 8KB swap
+# 40KB boot, no keyvault, 16KB NSC, 64KB partitions, 8KB swap
 #WOLFBOOT_KEYVAULT_ADDRESS?=0xA000
-#WOLFBOOT_KEYVAULT_SIZE?=0x14000
-#WOLFBOOT_NSC_ADDRESS?=0x1E000
-#WOLFBOOT_NSC_SIZE?=0x2000
-#WOLFBOOT_PARTITION_SIZE?=0xF000
-#WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
-#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x2F000
-#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x3E000
+#WOLFBOOT_KEYVAULT_SIZE?=0
+#WOLFBOOT_NSC_ADDRESS?=0xA000
+#WOLFBOOT_NSC_SIZE?=0x4000
+#WOLFBOOT_PARTITION_SIZE?=0x10000
+#WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x0E000
+#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x1E000
+#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x2E000

config/examples/mcxw.config

@@ -29,11 +29,11 @@ PKA?=1
 WOLFBOOT_SECTOR_SIZE?=0x2000
 
 # Default configuration
-# 32KB boot, 44KB partitions, 8KB swap
-WOLFBOOT_PARTITION_SIZE?=0xB000
+# 32KB boot, 40KB partitions, 8KB swap
+WOLFBOOT_PARTITION_SIZE?=0xA000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x8000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x13000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x1E000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x12000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x1C000
 
 # Alternate larger configuration for debugging or ARMASM
 # 40KB boot, 40KB partitions, 8KB swap

config/examples/nrf5340-tz.config

@@ -26,19 +26,19 @@ QSPI_FLASH?=1
 # Flash is 4KB pages (app)
 WOLFBOOT_SECTOR_SIZE?=0x1000
 
-# Flash keyvault: 124K
-WOLFBOOT_KEYVAULT_ADDRESS?=0x20000
-WOLFBOOT_KEYVAULT_SIZE?=0x1F000
+# Flash keyvault: none
+WOLFBOOT_KEYVAULT_ADDRESS?=0x1F000
+WOLFBOOT_KEYVAULT_SIZE?=0
 
 # Flash NSC: 4K
 # Note: the NSC area must be defined so that:
 # - Its size is exactly 32, 64, 128, 256, 512, 1024, 2048 or 4096 bytes
 # - Its end is 16K-aligned
-WOLFBOOT_NSC_ADDRESS?=0x3F000
+WOLFBOOT_NSC_ADDRESS?=0x1F000
 WOLFBOOT_NSC_SIZE?=0x01000
 
-# Application offset (reserve 256K for wolfBoot + keyvault + NSC)
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x40000
+# Application offset (reserve 128K for wolfBoot + keyvault + NSC)
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000
 
 # Application Partition Size (768KB)
 WOLFBOOT_PARTITION_SIZE?=0xC0000

config/examples/stm32h5.config

@@ -20,8 +20,8 @@ RAM_CODE?=0
 DUALBANK_SWAP?=0
 WOLFBOOT_PARTITION_SIZE?=0xA0000
 WOLFBOOT_SECTOR_SIZE?=0x2000
-WOLFBOOT_KEYVAULT_ADDRESS?=0x0C040000
-WOLFBOOT_KEYVAULT_SIZE?=0x1C000
+WOLFBOOT_KEYVAULT_ADDRESS?=0x0C05C000
+WOLFBOOT_KEYVAULT_SIZE?=0
 WOLFBOOT_NSC_ADDRESS?=0x0C05C000
 WOLFBOOT_NSC_SIZE?=0x4000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08060000

config/examples/stm32u5.config

@@ -22,8 +22,8 @@ RAM_CODE?=0
 DUALBANK_SWAP?=0
 WOLFBOOT_PARTITION_SIZE?=0x1F800
 WOLFBOOT_SECTOR_SIZE?=0x2000
-WOLFBOOT_KEYVAULT_ADDRESS?=0x0C020000
-WOLFBOOT_KEYVAULT_SIZE?=0x18000
+WOLFBOOT_KEYVAULT_ADDRESS?=0x0C038000
+WOLFBOOT_KEYVAULT_SIZE?=0
 WOLFBOOT_NSC_ADDRESS?=0x0C038000
 WOLFBOOT_NSC_SIZE?=0x8000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08040000

hal/lpc55s69.ld

@@ -2,8 +2,7 @@ MEMORY
 {
     FLASH (rx) :          ORIGIN = 0x10000000, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
     RAM (rwx) :           ORIGIN = 0x30000000, LENGTH = 0x10000 /* 64K */
-    RAM_HEAP (rwx) :      ORIGIN = 0x30010000, LENGTH = 0xC000 /* 48K */
-    RAM_KV (rwx) :        ORIGIN = 0x3001C000, LENGTH = 0x2000 /* 8K */
+    RAM_HEAP (rwx) :      ORIGIN = 0x30010000, LENGTH = 0xE000 /* 56K */
     FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
     FLASH_NSC (rx) :      ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
 }
@@ -65,9 +64,6 @@ SECTIONS
 
 END_STACK = ORIGIN(RAM) + LENGTH(RAM);
 
-_keyvault_origin = ORIGIN(RAM_KV);
-_keyvault_size = LENGTH(RAM_KV);
-
 _flash_keyvault = ORIGIN(FLASH_KEYVAULT);
 _flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
 

hal/mcxn.ld

@@ -2,8 +2,7 @@ MEMORY
 {
     FLASH (rx) :          ORIGIN = 0x00000000, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
     RAM (rwx) :           ORIGIN = 0x30000000, LENGTH = 0x10000 /* 64K */
-    RAM_HEAP (rwx) :      ORIGIN = 0x30010000, LENGTH = 0xC000 /* 48K */
-    RAM_KV (rwx) :        ORIGIN = 0x3001C000, LENGTH = 0x2000 /* 8K */
+    RAM_HEAP (rwx) :      ORIGIN = 0x30010000, LENGTH = 0xE000 /* 56K */
     FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
     FLASH_NSC (rx) :      ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
 }
@@ -65,9 +64,6 @@ SECTIONS
 
 END_STACK = ORIGIN(RAM) + LENGTH(RAM);
 
-_keyvault_origin = ORIGIN(RAM_KV);
-_keyvault_size = LENGTH(RAM_KV);
-
 _flash_keyvault = ORIGIN(FLASH_KEYVAULT);
 _flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
 

hal/mcxw.ld

@@ -2,8 +2,7 @@ MEMORY
 {
     FLASH (rx) :          ORIGIN = 0x00000000, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
     RAM (rwx) :           ORIGIN = 0x30000000, LENGTH = 0x6000 /* 24K */
-    RAM_HEAP (rwx) :      ORIGIN = 0x30006000, LENGTH = 0x6000 /* 24K */
-    RAM_KV (rwx) :        ORIGIN = 0x3000C000, LENGTH = 0x2000 /* 8K */
+    RAM_HEAP (rwx) :      ORIGIN = 0x30006000, LENGTH = 0x8000 /* 32K */
     FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
     FLASH_NSC (rx) :      ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
 }
@@ -65,9 +64,6 @@ SECTIONS
 
 END_STACK = ORIGIN(RAM) + LENGTH(RAM);
 
-_keyvault_origin = ORIGIN(RAM_KV);
-_keyvault_size = LENGTH(RAM_KV);
-
 _flash_keyvault = ORIGIN(FLASH_KEYVAULT);
 _flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
 

hal/nrf5340.ld

@@ -3,8 +3,7 @@ MEMORY
     FLASH (rx) :          ORIGIN = @ARCH_FLASH_OFFSET@, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
     FLASH_NET (rx) :      ORIGIN = 0x01000000, LENGTH = 0x40000 /* 256K */
     RAM (rwx) :           ORIGIN = 0x20000000, LENGTH = 0x10000 /* 64K */
-    RAM_HEAP (rw) :       ORIGIN = 0x20010000, LENGTH = 0xc000  /* 48K */
-    RAM_KV (rw) :         ORIGIN = 0x2001c000, LENGTH = 0x2000  /* 8K */
+    RAM_HEAP (rw) :       ORIGIN = 0x20010000, LENGTH = 0xe000  /* 56K */
     FLASH_KEYVAULT (rw) : ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
     FLASH_NSC(rx) :       ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
 }
@@ -64,9 +63,6 @@ SECTIONS
 
 END_STACK = ORIGIN(RAM) + LENGTH(RAM);
 
-_keyvault_origin = ORIGIN(RAM_KV);
-_keyvault_size = LENGTH(RAM_KV);
-
 _flash_keyvault = ORIGIN(FLASH_KEYVAULT);
 _flash_keyvault_size = LENGTH(FLASH_KEYVAULT);
 

hal/stm32h5.ld

@@ -2,8 +2,7 @@ MEMORY
 {
     FLASH (rx) :    ORIGIN = @WOLFBOOT_ORIGIN@, LENGTH = @WOLFBOOT_KEYVAULT_ADDRESS@ - @ARCH_FLASH_OFFSET@
     RAM (rwx) :     ORIGIN = 0x30000000, LENGTH = 0x20000
-    RAM_KV (rw):    ORIGIN = 0x30020000, LENGTH = 0x10000
-    RAM_HEAP (rw):  ORIGIN = 0x30030000, LENGTH = 0x10000 /* 64KB Heap for wolfcrypt/PKCS11 */
+    RAM_HEAP (rw):  ORIGIN = 0x30020000, LENGTH = 0x20000 /* 128KB Heap for wolfcrypt/PKCS11 */
     FLASH_KEYVAULT(rw): ORIGIN = @WOLFBOOT_KEYVAULT_ADDRESS@, LENGTH = @WOLFBOOT_KEYVAULT_SIZE@
     FLASH_NSC(rx): ORIGIN = @WOLFBOOT_NSC_ADDRESS@, LENGTH = @WOLFBOOT_NSC_SIZE@
 }
@@ -60,9 +59,6 @@ SECTIONS
 
 END_STACK = ORIGIN(RAM) + LENGTH(RAM);
 
-_keyvault_origin = ORIGIN(RAM_KV);
-_keyvault_size = LENGTH(RAM_KV);
-
 _flash_keyvault = ORIGIN(FLASH_KEYVAULT);
 _flash_keyvault_size = LENGTH(FLASH_KEYVAULT);