treewide: Remove references to SOC_NRF54L15_ENGA_CPUFLPR

The SoC has now been removed.

Signed-off-by: Carles Cufi <[email protected]>

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 || SOC_NRF54L15_CPUFLPR) && PARTITION_MANAGER_ENABLED
+if SOC_NRF54L15_CPUFLPR && PARTITION_MANAGER_ENABLED
 config FLASH_BASE_ADDRESS
 	hex
 	default 0x0

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

@@ -68,11 +68,8 @@ int lib_kmu_provision_slot(int slot_id, struct kmu_src *kmu_src)
 		return -LIB_KMU_NULL_PNT;
 	}
 
-	/* The DEST address must be 64-bit aligned on nrf54l15pdk.
-	 * On nrf54l15dk, the alignment requirement changed to 128 bits.
-	 */
-	__ASSERT(IS_PTR_ALIGNED_BYTES(kmu_src->dest,
-				      (IS_ENABLED(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) ? 8 : 16)),
+	 /* On nrf54l15dk, the alignment requirement is 128 bits. */
+	__ASSERT(IS_PTR_ALIGNED_BYTES(kmu_src->dest, 16)),
 		 "DEST misaligned");
 
 	int result = 1;

subsys/partition_manager/CMakeLists.txt

@@ -134,7 +134,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 OR CONFIG_SOC_NRF54L15_CPUFLPR)
+if (CONFIG_SOC_NRF54L15_CPUFLPR)
   ncs_add_partition_manager_config(pm.yml.vpr_launcher)
 endif()
 

subsys/partition_manager/Kconfig

@@ -146,7 +146,7 @@ rsource "Kconfig.template.partition_config"
 rsource "Kconfig.template.partition_region"
 endif
 
-if SOC_NRF54L15_ENGA_CPUFLPR || SOC_NRF54L15_CPUFLPR
+if SOC_NRF54L15_CPUFLPR
 config PM_PARTITION_SIZE_VPR_LAUNCHER
 	hex
 	default $(dt_node_reg_addr_hex,/soc/rram-controller@5004b000/rram@165000)
@@ -241,14 +241,12 @@ config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
 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)
 

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.
-#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if defined(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 || CONFIG_SOC_NRF54L15_CPUAPP) */
+#endif /* CONFIG_SOC_NRF54L15_CPUAPP */

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.
-#if defined(CONFIG_SOC_NRF54L15_ENGA_CPUAPP) || defined(CONFIG_SOC_NRF54L15_CPUAPP)
+#if defined(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 || CONFIG_SOC_NRF54L15_CPUAPP)) */
+#endif /* CONFIG_SOC_NRF54L15_CPUAPP */