Skip to content

Commit 6ccff5e

Browse files
committed
treewide: Remove references to SOC_NRF54L15_ENGA_CPUFLPR
The SoC has now been removed. Signed-off-by: Carles Cufi <[email protected]>
1 parent 2d001cd commit 6ccff5e

File tree

6 files changed

+9
-15
lines changed

6 files changed

+9
-15
lines changed

Kconfig.nrf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ config GETOPT
110110
default n
111111

112112
# Temporary hack to be able to build samples and tests on the nRF51L15 FLPR core
113-
if (SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR) && PARTITION_MANAGER_ENABLED
113+
if SOC_NRF54L15_CPUFLPR && PARTITION_MANAGER_ENABLED
114114
config FLASH_BASE_ADDRESS
115115
hex
116116
default 0x0

subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,8 @@ int lib_kmu_provision_slot(int slot_id, struct kmu_src *kmu_src)
6868
return -LIB_KMU_NULL_PNT;
6969
}
7070

71-
/* The DEST address must be 64-bit aligned on nrf54l15pdk.
72-
* On nrf54l15dk, the alignment requirement changed to 128 bits.
73-
*/
74-
__ASSERT(IS_PTR_ALIGNED_BYTES(kmu_src->dest,
75-
(IS_ENABLED(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) ? 8 : 16)),
76-
"DEST misaligned");
71+
/* On nrf54l15dk, the alignment requirement is 128 bits. */
72+
__ASSERT(IS_PTR_ALIGNED_BYTES(kmu_src->dest, 16), "DEST misaligned");
7773

7874
int result = 1;
7975

subsys/partition_manager/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ if (CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_FLASH)
134134
ncs_add_partition_manager_config(pm.yml.modem_trace)
135135
endif()
136136

137-
if (CONFIG_SOC_NRF54L15_ENGA_CPUFLPR OR CONFIG_SOC_NRF54L15_CPUFLPR)
137+
if (CONFIG_SOC_NRF54L15_CPUFLPR)
138138
ncs_add_partition_manager_config(pm.yml.vpr_launcher)
139139
endif()
140140

subsys/partition_manager/Kconfig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ rsource "Kconfig.template.partition_config"
146146
rsource "Kconfig.template.partition_region"
147147
endif
148148

149-
if SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR
149+
if SOC_NRF54L15_CPUFLPR
150150
config PM_PARTITION_SIZE_VPR_LAUNCHER
151151
hex
152152
default $(dt_node_reg_addr_hex,/soc/rram-controller@5004b000/rram@165000)
@@ -241,14 +241,12 @@ config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
241241
config PM_SRAM_BASE
242242
hex
243243
default $(dt_node_reg_addr_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET
244-
default 0x20000000 if SOC_NRF54L15_ENGA_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf54l15_cpuflpr.dtsi
245244
default 0x20000000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf54l15_cpuflpr.dtsi
246245
default $(dt_node_reg_addr_hex,/soc/memory@20000000)
247246

248247
config PM_SRAM_SIZE
249248
hex
250249
default $(dt_node_reg_size_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET
251-
default 0x40000 if SOC_NRF54L15_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi
252250
default 0x40000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi
253251
default $(dt_node_reg_size_hex,/soc/memory@20000000)
254252

subsys/partition_manager/pm.yml.nvs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# In nRF54L15 we place the TF-M non-secure storage partitions after the
44
# TF-M non-secure application to avoid splitting the secure/non-secure
55
# partitions more than necessary.
6-
#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)
6+
#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
77
nvs_storage:
88
placement:
99
after: [app]
@@ -30,4 +30,4 @@ nvs_storage:
3030
#endif
3131
size: CONFIG_PM_PARTITION_SIZE_NVS_STORAGE
3232

33-
#endif /* (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP) */
33+
#endif /* CONFIG_SOC_NRF54L15_CPUAPP */

subsys/partition_manager/pm.yml.settings

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# In nRF54L15 we place the TF-M non-secure storage partitions after the
44
# TF-M non-secure application to avoid splitting the secure/non-secure
55
# partitions more than necessary.
6-
#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)
6+
#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
77
settings_storage:
88
placement:
99
after: [app]
@@ -27,4 +27,4 @@ settings_storage:
2727
#endif
2828
size: CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE
2929

30-
#endif /* (CONFIG_SOC_NRF54L15_ENGA_CPUAPP || CONFIG_SOC_NRF54L15_CPUAPP)) */
30+
#endif /* CONFIG_SOC_NRF54L15_CPUAPP */

0 commit comments

Comments
 (0)