partition_manager: Remove support for nrf54l20pdk

nordic-segl · nordicjm · commit e117f52ca4e7 · 2025-07-14T11:45:14.000+01:00
Remove all occurrences of nrf54l20pdk as it is obsolete target.
It was renamed to nrf54lm20pdk and then to nrf54lm20dk.

Signed-off-by: Sebastian Głąb &lt;sebastian.glab@nordicsemi.no&gt;
diff --git a/Kconfig.nrf b/Kconfig.nrf
@@ -100,21 +100,21 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 	  chosen Zephyr flash devicetree node to ensure that swapping can be
 	  performed.
 
-# Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54L20 Eng A/nRF7120 FLPR core
+# Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54LM20A Eng A/nRF7120 FLPR core
 config FLASH_BASE_ADDRESS
 	hex
 	depends on PARTITION_MANAGER_ENABLED
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR|| SOC_NRF7120_ENGA_CPUFLPR
-	default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR|| SOC_NRF7120_ENGA_CPUFLPR
+	default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
 	default 0x2C0000 if SOC_NRF7120_ENGA_CPUFLPR
 
 config FLASH_SIZE
 	int
 	depends on PARTITION_MANAGER_ENABLED
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
 	default 1012 if SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR
 	default 1524 if SOC_NRF54L15_CPUFLPR
-	default 2036 if SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR
+	default 2036 if SOC_NRF54LM20A_ENGA_CPUFLPR
 	default 128 if SOC_NRF7120_ENGA_CPUFLPR
 
 config NRF_SECURITY_ENABLER
diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml
@@ -46,12 +46,6 @@
     - nrf54l09pdk/nrf54l09/cpuflpr
   comment: "https://nordicsemi.atlassian.net/browse/NRFX-7265"
 
-- scenarios:
-    - nrf.extended.drivers.sensor.qdec.pm_runtime
-  platforms:
-    - nrf54l20pdk/nrf54l20/cpuflpr
-  comment: "https://nordicsemi.atlassian.net/browse/NRFX-7267"
-
 - scenarios:
     - sample.suit.*
     - suit-platform.integration.*
diff --git a/soc/nordic/nrf54l/Kconfig.defconfig.nrf54lm20a_enga_cpuflpr b/soc/nordic/nrf54l/Kconfig.defconfig.nrf54lm20a_enga_cpuflpr
@@ -1,4 +1,4 @@
-# Nordic Semiconductor nRF54L20 MCU
+# Nordic Semiconductor nRF54LM20A MCU
 
 # Copyright (c) 2025 Nordic Semiconductor ASA
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
diff --git a/subsys/nrf_security/src/drivers/cracen/silexpk/src/iomem.c b/subsys/nrf_security/src/drivers/cracen/silexpk/src/iomem.c
@@ -68,7 +68,7 @@ void sx_wrpkmem(void *dst, const void *src, size_t sz)
 	memcpy((char *)d, (char *)s, sz);
 }
 
-#else /* 54L20 requires word-aligned, word-sized memory accesses */
+#else /* 54LM20A requires word-aligned, word-sized memory accesses */
 
 static void write_incomplete_word(uint32_t *dst, const uint8_t *bytes,
 				  size_t first_byte_pos, size_t num_bytes)
diff --git a/subsys/partition_manager/CMakeLists.txt b/subsys/partition_manager/CMakeLists.txt
@@ -127,7 +127,7 @@ if (CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_FLASH)
   ncs_add_partition_manager_config(pm.yml.modem_trace)
 endif()
 
-if(CONFIG_SOC_NRF54L15_CPUFLPR OR CONFIG_SOC_NRF54L09_ENGA_CPUFLPR OR CONFIG_SOC_NRF54L20_ENGA_CPUFLPR OR CONFIG_SOC_NRF54LM20A_ENGA_CPUFLPR OR CONFIG_SOC_NRF54LV10A_ENGA_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
+if(CONFIG_SOC_NRF54L15_CPUFLPR OR CONFIG_SOC_NRF54L09_ENGA_CPUFLPR OR CONFIG_SOC_NRF54LM20A_ENGA_CPUFLPR OR CONFIG_SOC_NRF54LV10A_ENGA_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
   ncs_add_partition_manager_config(pm.yml.vpr_launcher)
 endif()
 
diff --git a/subsys/partition_manager/Kconfig b/subsys/partition_manager/Kconfig
@@ -111,9 +111,8 @@ endif
 
 config PM_PARTITION_SIZE_VPR_LAUNCHER
 	hex
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
 	default $(dt_node_reg_addr_hex,/soc/rram-controller@5004b000/rram@165000) if SOC_NRF54L15_CPUFLPR
-	default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@1ed000) if SOC_NRF54L20_ENGA_CPUFLPR
 	default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@1e5000) if SOC_NRF54LM20A_ENGA_CPUFLPR
 	default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@ee000) if SOC_NRF54L09_ENGA_CPUFLPR
 	default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@ed000) if SOC_NRF54LV10A_ENGA_CPUFLPR
@@ -125,11 +124,10 @@ config PM_PARTITION_SIZE_VPR_LAUNCHER
 
 config PM_RAM_SIZE_VPR_LAUNCHER
 	hex
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
 	default 0x28000 if SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
 	default 0x23c00 if SOC_NRF54L09_ENGA_CPUFLPR
 	default 0x1fc00 if SOC_NRF54LV10A_ENGA_CPUFLPR
-	default 0x6fc00 if SOC_NRF54L20_ENGA_CPUFLPR
 	default 0x67c00 if SOC_NRF54LM20A_ENGA_CPUFLPR
 	help
 	  Size of RAM available for the vpr_launcher application (usually run on cpuapp).
@@ -207,15 +205,15 @@ 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_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
+	default 0x20000000 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
 	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 0x2fc00 if SOC_NRF54L09_ENGA_CPUFLPR  || SOC_NRF54LV10A_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l09_enga_cpuflpr.dtsi
 	default 0x40000 if SOC_NRF54L15_CPUFLPR  # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi
-	default 0x7fc00 if SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l20_enga_cpuflpr.dtsi
+	default 0x7fc00 if SOC_NRF54LM20A_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54lm20a_enga_cpuflpr.dtsi
 	default 0x40000 if SOC_NRF7120_ENGA_CPUFLPR  # Because the cpuapp_mram DT node is deleted in nrf7120_enga_cpuflpr.dtsi
 	default $(dt_node_reg_size_hex,/soc/memory@20000000)
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Nordic Semiconductor nRF54L20 MCU`
	`1`	`+# Nordic Semiconductor nRF54LM20A MCU`
`2`	`2`
`3`	`3`	`# Copyright (c) 2025 Nordic Semiconductor ASA`
`4`	`4`	`# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ void sx_wrpkmem(void dst, const void src, size_t sz)`
`68`	`68`	`memcpy((char )d, (char )s, sz);`
`69`	`69`	`}`
`70`	`70`
`71`		`-#else /* 54L20 requires word-aligned, word-sized memory accesses */`
	`71`	`+#else /* 54LM20A requires word-aligned, word-sized memory accesses */`
`72`	`72`
`73`	`73`	`static void write_incomplete_word(uint32_t dst, const uint8_t bytes,`
`74`	`74`	`size_t first_byte_pos, size_t num_bytes)`