samples: matter: bootloader size optimizations

Add LTO and size optimization configs for mcuboot and remove redundant configs. Set mcuboot size to `0xD000` for nRF54Lxx Remove PDK overlays. Signed-off-by: Maciej Baczmanski <[email protected]>
nrfconnect · Dec 5, 2024 · 51c15da · 51c15da
1 parent 4505273
commit 51c15da
Show file tree

Hide file tree

Showing 33 changed files with 243 additions and 564 deletions.
diff --git a/samples/matter/light_bulb/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml b/samples/matter/light_bulb/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml
@@ -1,45 +1,45 @@
 mcuboot:
   address: 0x0
   region: flash_primary
-  size: 0xc000
+  size: 0xD000
 mcuboot_pad:
-  address: 0xc000
+  address: 0xD000
   region: flash_primary
   size: 0x800
 app:
-  address: 0xc800
+  address: 0xD800
   region: flash_primary
-  size: 0x165800
+  size: 0x164800
 mcuboot_primary:
   orig_span: &id001
   - mcuboot_pad
   - app
   span: *id001
-  address: 0xc000
+  address: 0xD000
   region: flash_primary
-  size: 0x166000
+  size: 0x165000
 mcuboot_primary_app:
   orig_span: &id002
   - app
   span: *id002
-  address: 0xc800
+  address: 0xD800
   region: flash_primary
-  size: 0x165800
+  size: 0x164800
 factory_data:
   address: 0x172000
   region: flash_primary
   size: 0x1000
 settings_storage:
   address: 0x173000
   region: flash_primary
-  size: 0xa000
+  size: 0xA000
 mcuboot_secondary:
   address: 0x0
   orig_span: &id003
   - mcuboot_secondary_pad
   - mcuboot_secondary_app
   region: external_flash
-  size: 0x166000
+  size: 0x165000
   span: *id003
 mcuboot_secondary_pad:
   region: external_flash
@@ -48,9 +48,9 @@ mcuboot_secondary_pad:
 mcuboot_secondary_app:
   region: external_flash
   address: 0x800
-  size: 0x165800
+  size: 0x164800
 external_flash:
-  address: 0x166000
-  size: 0x69a000
+  address: 0x165000
+  size: 0x69B000
   device: MX25R64
   region: external_flash
diff --git a/samples/matter/light_bulb/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml b/samples/matter/light_bulb/pm_static_nrf54l15dk_nrf54l15_cpuapp_ns.yml
@@ -2,27 +2,27 @@
 mcuboot:
   address: 0x0
   region: flash_primary
-  size: 0xc000
+  size: 0xD000
 mcuboot_pad:
-  address: 0xc000
+  address: 0xD000
   region: flash_primary
   size: 0x800
 tfm:
-  address: 0xc800
+  address: 0xD800
   region: flash_primary
   size: 0x1F800
 app:
-  address: 0x2C000
+  address: 0x2D000
   region: flash_primary
-  size: 0x13E000
+  size: 0x13D000
 factory_data:
   address: 0x16A000
   region: flash_primary
   size: 0x1000
 settings_storage:
   address: 0x16B000
   region: flash_primary
-  size: 0xa000
+  size: 0xA000
 tfm_storage:
   address: 0x175000
   orig_span: &id006
@@ -33,8 +33,8 @@ tfm_storage:
   size: 0x8000
   span: *id006
 external_flash:
-  address: 0x15E000
-  size: 0x6A2000
+  address: 0x15D000
+  size: 0x6A3000
   device: MX25R64
   region: external_flash
 ### Bootloader configuration
@@ -44,24 +44,24 @@ mcuboot_primary:
   - tfm
   - app
   span: *id001
-  address: 0xc000
+  address: 0xD000
   region: flash_primary
-  size: 0x15E000
+  size: 0x15D000
 mcuboot_primary_app:
   orig_span: &id002
   - app
   - tfm
   span: *id002
-  address: 0xc800
+  address: 0xD800
   region: flash_primary
-  size: 0x15D800
+  size: 0x15C800
 mcuboot_secondary:
   address: 0x0
   orig_span: &id003
   - mcuboot_secondary_pad
   - mcuboot_secondary_app
   region: external_flash
-  size: 0x15E000
+  size: 0x15D000
   span: *id003
 mcuboot_secondary_pad:
   region: external_flash
@@ -70,22 +70,22 @@ mcuboot_secondary_pad:
 mcuboot_secondary_app:
   region: external_flash
   address: 0x800
-  size: 0x15D800
+  size: 0x15C800
 ### TFM configuration
 tfm_secure:
-  address: 0xc000
+  address: 0xD000
   orig_span: &id004
   - mcuboot_pad
   - tfm
   region: flash_primary
   size: 0x20000
   span: *id004
 tfm_nonsecure:
-  address: 0x2C000
+  address: 0x2D000
   orig_span: &id005
   - app
   region: flash_primary
-  size: 0x13E000
+  size: 0x13D000
   span: *id005
 tfm_its:
   address: 0x175000

diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.conf
diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay b/samples/matter/light_bulb/sysbuild/mcuboot/boards/nrf54l15pdk_nrf54l15_cpuapp.overlay
diff --git a/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf b/samples/matter/light_bulb/sysbuild/mcuboot/prj.conf
@@ -13,8 +13,6 @@ CONFIG_PM=n
 CONFIG_FLASH=y
 CONFIG_FPROTECT=y
 
-CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
-
 # Use minimal C library instead of the Picolib
 CONFIG_MINIMAL_LIBC=y
 
@@ -37,3 +35,8 @@ CONFIG_MULTITHREADING=n
 CONFIG_TICKLESS_KERNEL=n
 CONFIG_TIMEOUT_64BIT=n
 CONFIG_NRF_ENABLE_ICACHE=n
+CONFIG_SIZE_OPTIMIZATIONS=y
+
+# Activate LTO
+CONFIG_LTO=y
+CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
diff --git a/samples/matter/light_switch/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml b/samples/matter/light_switch/pm_static_nrf54l15dk_nrf54l15_cpuapp.yml
@@ -1,45 +1,45 @@
 mcuboot:
   address: 0x0
   region: flash_primary
-  size: 0xc000
+  size: 0xD000
 mcuboot_pad:
-  address: 0xc000
+  address: 0xD000
   region: flash_primary
   size: 0x800
 app:
-  address: 0xc800
+  address: 0xD800
   region: flash_primary
-  size: 0x165800
+  size: 0x164800
 mcuboot_primary:
   orig_span: &id001
   - mcuboot_pad
   - app
   span: *id001
-  address: 0xc000
+  address: 0xD000
   region: flash_primary
-  size: 0x166000
+  size: 0x165000
 mcuboot_primary_app:
   orig_span: &id002
   - app
   span: *id002
-  address: 0xc800
+  address: 0xD800
   region: flash_primary
-  size: 0x165800
+  size: 0x164800
 factory_data:
   address: 0x172000
   region: flash_primary
   size: 0x1000
 settings_storage:
   address: 0x173000
   region: flash_primary
-  size: 0xa000
+  size: 0xA000
 mcuboot_secondary:
   address: 0x0
   orig_span: &id003
   - mcuboot_secondary_pad
   - mcuboot_secondary_app
   region: external_flash
-  size: 0x166000
+  size: 0x165000
   span: *id003
 mcuboot_secondary_pad:
   region: external_flash
@@ -48,9 +48,9 @@ mcuboot_secondary_pad:
 mcuboot_secondary_app:
   region: external_flash
   address: 0x800
-  size: 0x165800
+  size: 0x164800
 external_flash:
-  address: 0x166000
-  size: 0x69a000
+  address: 0x165000
+  size: 0x69B000
   device: MX25R64
   region: external_flash