Skip to content

Commit a3aaa3f

Browse files
mkapala-nordicjfischer-no
authored andcommitted
sysbuild: cmake: Add nRF54L support for Partititon Manager
Following PRs added nRF54L support for Partition Manager in the default build system: * #14246 * #14368 This commit adds such support in the sysbuild based on the implementation from the mentioned PRs. Jira: NCSDK-26123 Signed-off-by: Mateusz Kapala <mateusz.kapala@nordicsemi.no>
1 parent ee0bc4f commit a3aaa3f

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

cmake/sysbuild/partition_manager.cmake

+11-2
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,15 @@ foreach(d APP ${PM_DOMAINS})
498498
set(otp_size 764) # 191 * 4
499499
endif()
500500

501+
sysbuild_get(${image_name}_CONFIG_SOC_SERIES_NRF54LX IMAGE ${image_name} VAR CONFIG_SOC_SERIES_NRF54LX KCONFIG)
502+
if(${image_name}_CONFIG_SOC_SERIES_NRF54LX)
503+
set(soc_nvs_controller rram_controller)
504+
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF_RRAM)
505+
else()
506+
set(soc_nvs_controller flash_controller)
507+
set(soc_nvs_controller_driver_kc CONFIG_SOC_FLASH_NRF)
508+
endif()
509+
501510
add_region(
502511
NAME sram_primary
503512
SIZE ${${image_name}_CONFIG_PM_SRAM_SIZE}
@@ -525,8 +534,8 @@ foreach(d APP ${PM_DOMAINS})
525534
SIZE ${flash_size}
526535
BASE ${${image_name}_CONFIG_FLASH_BASE_ADDRESS}
527536
PLACEMENT complex
528-
DEVICE flash_controller
529-
DEFAULT_DRIVER_KCONFIG CONFIG_SOC_FLASH_NRF
537+
DEVICE ${soc_nvs_controller}
538+
DEFAULT_DRIVER_KCONFIG ${soc_nvs_controller_driver_kc}
530539
DOMAIN ${d}
531540
)
532541

sysbuild/Kconfig.sysbuild

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ menuconfig PARTITION_MANAGER
2222

2323
config PM_MCUBOOT_PAD
2424
hex "Memory reserved for MCUBOOT_PAD"
25+
default 0x800 if $(BOARD) = "nrf54l15pdk_nrf54l15_cpuapp"
2526
default 0x200
2627
depends on BOOTLOADER_MCUBOOT
2728
depends on PARTITION_MANAGER

0 commit comments

Comments
 (0)