From 8ced0cfd2cbfb7e61545043f7f68c51c438fe050 Mon Sep 17 00:00:00 2001 From: andrzej Date: Mon, 16 Sep 2024 15:24:42 +0200 Subject: [PATCH] nrf54l15dk: added placement patches as for nrf54lpdk A few placement changes had been done for nRF54l15pdk, but were not copied for the DK. This commit add them for the board. Signed-off-by: andrzej --- Kconfig.nrf | 2 +- modules/trusted-firmware-m/Kconfig.tfm.pm | 4 ++-- subsys/partition_manager/CMakeLists.txt | 2 +- subsys/partition_manager/Kconfig | 4 +++- subsys/partition_manager/pm.yml.nvs | 4 ++-- subsys/partition_manager/pm.yml.settings | 4 ++-- subsys/partition_manager/pm.yml.tfm | 4 ++-- sysbuild/Kconfig.sysbuild | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Kconfig.nrf b/Kconfig.nrf index 1034061fce04..125dc7da54ae 100644 --- a/Kconfig.nrf +++ b/Kconfig.nrf @@ -110,7 +110,7 @@ config GETOPT default n # Temporary hack to be able to build samples and tests on the nRF51L15 FLPR core -if SOC_NRF54L15_ENGA_CPUFLPR && PARTITION_MANAGER_ENABLED +if (SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR) && PARTITION_MANAGER_ENABLED config FLASH_BASE_ADDRESS hex default 0x0 diff --git a/modules/trusted-firmware-m/Kconfig.tfm.pm b/modules/trusted-firmware-m/Kconfig.tfm.pm index 20618c6d785d..869960030d76 100644 --- a/modules/trusted-firmware-m/Kconfig.tfm.pm +++ b/modules/trusted-firmware-m/Kconfig.tfm.pm @@ -28,14 +28,14 @@ config PM_PARTITION_SIZE_TFM default 0xFE00 if TFM_PROFILE_TYPE_MINIMAL && TFM_CMAKE_BUILD_TYPE_DEBUG && \ BOOTLOADER_MCUBOOT default 0x10000 if TFM_PROFILE_TYPE_MINIMAL && TFM_CMAKE_BUILD_TYPE_DEBUG - default 0x6800 if TFM_PROFILE_TYPE_MINIMAL && BOOTLOADER_MCUBOOT && SOC_NRF54L15_ENGA_CPUAPP + default 0x6800 if TFM_PROFILE_TYPE_MINIMAL && BOOTLOADER_MCUBOOT && (SOC_NRF54L15_ENGA_CPUAPP || SOC_NRF54L15_ENGA_CPUAPP) default 0x7E00 if TFM_PROFILE_TYPE_MINIMAL && BOOTLOADER_MCUBOOT default 0x8000 if TFM_PROFILE_TYPE_MINIMAL # NCSDK-13503: Temporarily bump size while regressions are being fixed default 0x60000 if TFM_REGRESSION_S default 0x4FE00 if TFM_CMAKE_BUILD_TYPE_DEBUG && BOOTLOADER_MCUBOOT default 0x50000 if TFM_CMAKE_BUILD_TYPE_DEBUG - default 0x3F800 if BOOTLOADER_MCUBOOT && SOC_NRF54L15_ENGA_CPUAPP + default 0x3F800 if BOOTLOADER_MCUBOOT && (SOC_NRF54L15_ENGA_CPUAPP || SOC_NRF54L15_ENGA_CPUAPP) default 0x3FE00 if BOOTLOADER_MCUBOOT default 0x40000 help diff --git a/subsys/partition_manager/CMakeLists.txt b/subsys/partition_manager/CMakeLists.txt index 81331ff04821..65d063e1347a 100644 --- a/subsys/partition_manager/CMakeLists.txt +++ b/subsys/partition_manager/CMakeLists.txt @@ -130,7 +130,7 @@ if (CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_FLASH) ncs_add_partition_manager_config(pm.yml.modem_trace) endif() -if (CONFIG_SOC_NRF54L15_ENGA_CPUFLPR) +if (CONFIG_SOC_NRF54L15_ENGA_CPUFLPR OR SOC_NRF54L15_ENGA_CPUFLPR) ncs_add_partition_manager_config(pm.yml.vpr_launcher) endif() diff --git a/subsys/partition_manager/Kconfig b/subsys/partition_manager/Kconfig index 3fe1916876eb..e6f397dba61b 100644 --- a/subsys/partition_manager/Kconfig +++ b/subsys/partition_manager/Kconfig @@ -139,7 +139,7 @@ rsource "Kconfig.template.partition_config" rsource "Kconfig.template.partition_region" endif -if SOC_NRF54L15_ENGA_CPUFLPR +if SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR config PM_PARTITION_SIZE_VPR_LAUNCHER hex default $(dt_node_reg_addr_hex,/soc/rram-controller@5004b000/rram@165000) @@ -235,12 +235,14 @@ config PM_SRAM_BASE hex default $(dt_node_reg_addr_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET default 0x20000000 if SOC_NRF54L15_ENGA_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf54l15_cpuflpr.dtsi + default 0x20000000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf54l15_cpuflpr.dtsi default $(dt_node_reg_addr_hex,/soc/memory@20000000) config PM_SRAM_SIZE hex default $(dt_node_reg_size_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET default 0x40000 if SOC_NRF54L15_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi + default 0x40000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi default $(dt_node_reg_size_hex,/soc/memory@20000000) endmenu # Partition Manager diff --git a/subsys/partition_manager/pm.yml.nvs b/subsys/partition_manager/pm.yml.nvs index 38d478f8a686..aac4c12e72af 100644 --- a/subsys/partition_manager/pm.yml.nvs +++ b/subsys/partition_manager/pm.yml.nvs @@ -3,7 +3,7 @@ # In nRF54L15 we place the TF-M non-secure storage partitions after the # TF-M non-secure application to avoid splitting the secure/non-secure # partitions more than necessary. -#ifdef CONFIG_SOC_NRF54L15_ENGA_CPUAPP +#ifdef (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP) nvs_storage: placement: after: [app] @@ -30,4 +30,4 @@ nvs_storage: #endif size: CONFIG_PM_PARTITION_SIZE_NVS_STORAGE -#endif /* CONFIG_SOC_NRF54L15_ENGA_CPUAPP */ +#endif /* (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP) */ diff --git a/subsys/partition_manager/pm.yml.settings b/subsys/partition_manager/pm.yml.settings index 3fddd8648e92..df484aeedfb2 100644 --- a/subsys/partition_manager/pm.yml.settings +++ b/subsys/partition_manager/pm.yml.settings @@ -3,7 +3,7 @@ # In nRF54L15 we place the TF-M non-secure storage partitions after the # TF-M non-secure application to avoid splitting the secure/non-secure # partitions more than necessary. -#ifdef CONFIG_SOC_NRF54L15_ENGA_CPUAPP +#ifdef (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP) settings_storage: placement: after: [app] @@ -27,4 +27,4 @@ settings_storage: #endif size: CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE -#endif /* CONFIG_SOC_NRF54L15_ENGA_CPUAPP */ +#endif /* (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP)) */ diff --git a/subsys/partition_manager/pm.yml.tfm b/subsys/partition_manager/pm.yml.tfm index 8a9099e78dda..85923d628b6c 100644 --- a/subsys/partition_manager/pm.yml.tfm +++ b/subsys/partition_manager/pm.yml.tfm @@ -26,7 +26,7 @@ tfm_storage: # In nRF54L15 we place the tfm_storage partitions before the # TF-M non-secure application to avoid splitting the secure/non-secure # partitions more than necessary. -#ifdef CONFIG_SOC_NRF54L15_ENGA_CPUAPP +#ifdef (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP) tfm_ps: placement: @@ -81,7 +81,7 @@ tfm_otp_nv_counters: inside: tfm_storage size: CONFIG_PM_PARTITION_SIZE_TFM_OTP_NV_COUNTERS -#endif /* CONFIG_SOC_NRF54L15_ENGA_CPUAPP */ +#endif /* (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP)*/ #endif /* CONFIG_PM_PARTITION_TFM_STORAGE */ diff --git a/sysbuild/Kconfig.sysbuild b/sysbuild/Kconfig.sysbuild index 36465544e775..2b3d92d199f2 100644 --- a/sysbuild/Kconfig.sysbuild +++ b/sysbuild/Kconfig.sysbuild @@ -16,7 +16,7 @@ if PARTITION_MANAGER config PM_MCUBOOT_PAD hex "Memory reserved for MCUBOOT_PAD" - default 0x800 if BOARD_NRF54L15PDK_NRF54L15_CPUAPP + default 0x800 if SOC_SERIES_NRF54LX default 0x200 depends on BOOTLOADER_MCUBOOT help