Updated mcxn build partition geometry

Author: danielinux

Makefile

@@ -447,8 +447,8 @@ test-app/image_v1_signed.bin: $(BOOT_IMG) keytools_check
 
 	$(Q)(test $(SIGN) = NONE) || $(SIGN_ENV) $(SIGN_TOOL) $(SIGN_OPTIONS) \
 		$(SECONDARY_SIGN_OPTIONS) $(BOOT_IMG) $(PRIVATE_KEY) \
-		$(SECONDARY_PRIVATE_KEY) 1 || true
-	$(Q)(test $(SIGN) = NONE) && $(SIGN_ENV) $(SIGN_TOOL) $(SIGN_OPTIONS) $(BOOT_IMG) 1 || true
+		$(SECONDARY_PRIVATE_KEY) 1
+	$(Q)(test $(SIGN) = NONE) && $(SIGN_ENV) $(SIGN_TOOL) $(SIGN_OPTIONS) $(BOOT_IMG) 1
 
 test-app/image.elf: wolfboot.elf
 	$(Q)$(MAKE) -C test-app WOLFBOOT_ROOT="$(WOLFBOOT_ROOT)" ELF_FLASH_SCATTER="$(ELF_FLASH_SCATTER)" image.elf

config/examples/mcxn-tz.config

@@ -32,23 +32,23 @@ PKA?=1
 WOLFBOOT_SECTOR_SIZE?=0x2000
 
 # Default configuration
-# 40KB boot, no keyvault, 8KB NSC, 64KB partitions, 8KB swap
+# 40KB boot, no keyvault, 8KB NSC, 72KB partitions, 8KB swap
 WOLFBOOT_KEYVAULT_ADDRESS?=0xA000
 WOLFBOOT_KEYVAULT_SIZE?=0
 WOLFBOOT_NSC_ADDRESS?=0xA000
 WOLFBOOT_NSC_SIZE?=0x2000
-WOLFBOOT_PARTITION_SIZE?=0x10000
+WOLFBOOT_PARTITION_SIZE?=0x12000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xC000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x1C000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x2C000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x1E000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x30000
 
 # Alternate larger configuration for debugging or ARMASM
-# 128KB boot, no keyvault, 8KB NSC, 64KB partitions, 8KB swap
+# 128KB boot, no keyvault, 8KB NSC, 72KB partitions, 8KB swap
 #WOLFBOOT_KEYVAULT_ADDRESS?=0x20000
 #WOLFBOOT_KEYVAULT_SIZE?=0
 #WOLFBOOT_NSC_ADDRESS?=0x20000
 #WOLFBOOT_NSC_SIZE?=0x2000
-#WOLFBOOT_PARTITION_SIZE?=0x10000
+#WOLFBOOT_PARTITION_SIZE?=0x12000
 #WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x22000
-#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x32000
-#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x42000
+#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x34000
+#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x46000

config/examples/mcxn-wolfcrypt-tz.config

@@ -34,23 +34,23 @@ WOLFCRYPT_TZ_PKCS11?=1
 WOLFBOOT_SECTOR_SIZE?=0x2000
 
 # Default configuration
-# 192KB boot, 96KB keyvault, 8KB NSC, 64KB partitions, 8KB swap
+# 192KB boot, 96KB keyvault, 8KB NSC, 72KB partitions, 8KB swap
 WOLFBOOT_KEYVAULT_ADDRESS?=0x30000
 WOLFBOOT_KEYVAULT_SIZE?=0x18000
 WOLFBOOT_NSC_ADDRESS?=0x48000
 WOLFBOOT_NSC_SIZE?=0x2000
-WOLFBOOT_PARTITION_SIZE?=0x10000
+WOLFBOOT_PARTITION_SIZE?=0x12000
 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x4A000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x5A000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x6A000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x5C000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x6E000
 
 # Alternate larger configuration for debugging or ARMASM
-# 320KB boot, 96KB keyvault, 8KB NSC, 64KB partitions, 8KB swap
+# 320KB boot, 96KB keyvault, 8KB NSC, 72KB partitions, 8KB swap
 #WOLFBOOT_KEYVAULT_ADDRESS?=0x50000
 #WOLFBOOT_KEYVAULT_SIZE?=0x18000
 #WOLFBOOT_NSC_ADDRESS?=0x68000
 #WOLFBOOT_NSC_SIZE?=0x2000
-#WOLFBOOT_PARTITION_SIZE?=0x10000
+#WOLFBOOT_PARTITION_SIZE?=0x12000
 #WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x6A000
-#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x7A000
-#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x8A000
+#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x7C000
+#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x8E000