partition_manager: Add support for nRF54L20 Enga cpuflpr

Introduced default values for symbol CONFIG_SOC_NRF54L20_ENGA_FPUFLPR.

Signed-off-by: Michał Stasiak <[email protected]>

Author: mstasiaknordic

Kconfig.nrf

@@ -104,19 +104,19 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 config GETOPT
 	default n
 
-# Temporary hack to be able to build samples and tests on the nRF51L15/nRF7120 FLPR core
+# Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L20 Eng A/nRF7120 FLPR core
 config FLASH_BASE_ADDRESS
 	hex
 	depends on PARTITION_MANAGER_ENABLED
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
-	default 0x0 if SOC_NRF54L15_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
+	default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR
 	default 0x2C0000 if SOC_NRF7120_ENGA_CPUFLPR
 
 config FLASH_SIZE
 	int
 	depends on PARTITION_MANAGER_ENABLED
-	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
-	default 1524 if SOC_NRF54L15_CPUFLPR
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
+	default 1524 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR
 	default 128 if SOC_NRF7120_ENGA_CPUFLPR
 
 config NRF_SECURITY_ENABLER

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_NRF7120_ENGA_CPUFLPR)
+if (CONFIG_SOC_NRF54L15_CPUFLPR OR CONFIG_SOC_NRF54L20_ENGA_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
   ncs_add_partition_manager_config(pm.yml.vpr_launcher)
 endif()
 

subsys/partition_manager/Kconfig

@@ -146,27 +146,16 @@ rsource "Kconfig.template.partition_config"
 rsource "Kconfig.template.partition_region"
 endif
 
-if SOC_NRF54L15_CPUFLPR
 config PM_PARTITION_SIZE_VPR_LAUNCHER
 	hex
-	default $(dt_node_reg_addr_hex,/soc/rram-controller@5004b000/rram@165000)
+	depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_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/mram@3e1000) if SOC_NRF7120_ENGA_CPUFLPR
 	help
 	  Memory set aside for the vpr_launcher partition.
-	  Must match the size of the cpuapp_rram partition which is deleted.
+	  Must match the size of the cpuapp_rram/cpuapp_mram partition which is deleted.
 	  This to place the flpr app's code at the address found in the devicetree.
-endif
-
-if SOC_NRF7120_ENGA_CPUFLPR
-
-config PM_PARTITION_SIZE_VPR_LAUNCHER
-	hex
-	default $(dt_node_reg_addr_hex,/soc/mram@3e1000)
-	help
-	  Memory set aside for the vpr_launcher partition.
-	  Must match the size of the cpuapp_mram partition which is deleted.
-	  This to place the flpr app's code at the address found in the devicetree.
-
-endif
 
 if WIFI_NRF70 && NRF_WIFI_PATCHES_EXT_FLASH_STORE
 
@@ -241,13 +230,15 @@ config PM_SRAM_BASE
 	hex
 	default $(dt_node_reg_addr_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET
 	default 0x20000000 if SOC_NRF54L15_CPUFLPR  # Because the cpuapp_sram DT node is deleted in nrf54l15_cpuflpr.dtsi
+	default 0x20000000 if SOC_NRF54L20_ENGA_CPUFLPR  # Because the cpuapp_sram DT node is deleted in nrf54l20_enga_cpuflpr.dtsi
 	default 0x20000000 if SOC_NRF7120_ENGA_CPUFLPR  # Because the cpuapp_sram DT node is deleted in nrf7120_enga_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_CPUFLPR  # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi
+	default 0x40000 if SOC_NRF54L20_ENGA_CPUFLPR  # Because the cpuapp_rram DT node is deleted in nrf54l20_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)