nrf54l15dk: patches needed for run MUBoot based dfu

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

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_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_CPUAPP)
 	default 0x3FE00 if BOOTLOADER_MCUBOOT
 	default 0x40000
 	help

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()
 

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

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

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

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

west.yml

@@ -140,7 +140,7 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: e66169aa8daf93eee0ff3729ecc2c343c7fade51
+      revision: f30dce197f34d4df77d8e66997dff0ce948c2b82
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR