samples: new mcuboot configuration

Align Sidewalk with nRF changes in: nrfconnect/sdk-nrf#19148 Signed-off-by: Krzysztof Taborowski <[email protected]>
ktaborowski · Dec 4, 2024 · 778216f · 778216f
1 parent 5308f19
commit 778216f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 31 deletions.
diff --git a/samples/sid_end_device/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml b/samples/sid_end_device/pm_static_nrf54l15dk_nrf54l10_cpuapp.yml
@@ -1,40 +1,40 @@
 app:
-  address: 0xc800
+  address: 0xe800
   end_address: 0xfd000
   region: flash_primary
-  size: 0xf0800
+  size: 0xee800
 mcuboot:
   address: 0x0
-  end_address: 0xc000
+  end_address: 0xe000
   placement:
     before:
     - mcuboot_primary
   region: flash_primary
-  size: 0xc000
+  size: 0xe000
 mcuboot_pad:
-  address: 0xc000
-  end_address: 0xc800
+  address: 0xe000
+  end_address: 0xe800
   placement:
     before:
     - mcuboot_primary_app
   region: flash_primary
   size: 0x800
 mcuboot_primary:
-  address: 0xc000
+  address: 0xe000
   end_address: 0xfd000
   orig_span: &id001
   - mcuboot_pad
   - app
   region: flash_primary
-  size: 0xf1000
+  size: 0xef000
   span: *id001
 mcuboot_primary_app:
-  address: 0xc800
+  address: 0xe800
   end_address: 0xfd000
   orig_span: &id002
   - app
   region: flash_primary
-  size: 0xf0800
+  size: 0xee800
   span: *id002
 settings_storage:
   address: 0xfd000
@@ -53,11 +53,11 @@ mfg_storage:
   size: 0x1000
 mcuboot_secondary:
   address: 0x0
-  end_address: 0xf1000
+  end_address: 0xef000
   placement:
     align:
       start: 0x4
   region: external_flash
   share_size:
   - mcuboot_primary
-  size: 0xf1000
+  size: 0xef000
diff --git a/samples/sid_end_device/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf b/samples/sid_end_device/sysbuild/mcuboot/boards/nrf54l15dk_nrf54l10_cpuapp.conf
@@ -4,31 +4,13 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to
-# test protecting factory data. It can be enabled while there is a support
-# for protection more than one region.
-CONFIG_FPROTECT=n
-
-# TODO: Workaround, disable memory guard to avoid false faults in application after boot
-CONFIG_HW_STACK_PROTECTION=n
-
-# Currently, without tickless kernel, the SYSCOUNTER value after the software
-# reset is not set properly and due to that the first system interrupt is not called
-# in the proper time - the SYSCOUNTER value is set to the value from before
-# reset + 1. Hence, the reboot time increases more and more.
-# To avoid it enable tickles kernel for mcuboot.
-CONFIG_TICKLESS_KERNEL=y
-
-CONFIG_BOOT_WATCHDOG_FEED=n
-
-CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
-
 # nRF54L15DK uses SPI NOR external flash
 CONFIG_GPIO=y
 CONFIG_SPI=y
 CONFIG_SPI_NOR=y
 CONFIG_SPI_NOR_SFDP_DEVICETREE=y
 CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096
+CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
 
 # required by SPI driver
 CONFIG_MULTITHREADING=y
diff --git a/samples/sid_end_device/sysbuild/mcuboot/prj.conf b/samples/sid_end_device/sysbuild/mcuboot/prj.conf
@@ -42,3 +42,5 @@ CONFIG_MULTITHREADING=n
 CONFIG_TICKLESS_KERNEL=n
 CONFIG_TIMEOUT_64BIT=n
 CONFIG_NRF_ENABLE_ICACHE=n
+CONFIG_SIZE_OPTIMIZATIONS=y
+