From f8a9a45f67dd12e2cfc3da80269d0ef591aa41fe Mon Sep 17 00:00:00 2001 From: Adam Kondraciuk Date: Mon, 24 Mar 2025 15:38:46 +0100 Subject: [PATCH 1/2] partition_manager: Add support for nRF54L09 Enga cpuflpr Set default values for `CONFIG_SOC_NRF54L09_ENGA_FPUFLPR` Signed-off-by: Adam Kondraciuk --- Kconfig.nrf | 12 +++++++----- subsys/partition_manager/CMakeLists.txt | 2 +- subsys/partition_manager/Kconfig | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Kconfig.nrf b/Kconfig.nrf index 173bbf0d798f..68cecf77ac6b 100644 --- a/Kconfig.nrf +++ b/Kconfig.nrf @@ -106,19 +106,21 @@ 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/nRF54L20 Eng A/nRF7120 FLPR core +# Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54L20 Eng A/nRF7120 FLPR core config FLASH_BASE_ADDRESS hex depends on PARTITION_MANAGER_ENABLED - depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR - default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR + depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR + default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_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_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR - default 1524 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR + depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR + default 1012 if SOC_NRF54L09_ENGA_CPUFLPR + default 1524 if SOC_NRF54L15_CPUFLPR + default 2036 if SOC_NRF54L20_ENGA_CPUFLPR default 128 if SOC_NRF7120_ENGA_CPUFLPR config NRF_SECURITY_ENABLER diff --git a/subsys/partition_manager/CMakeLists.txt b/subsys/partition_manager/CMakeLists.txt index ab9386df4011..29c6ebb0c747 100644 --- 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_NRF54L20_ENGA_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR) +if (CONFIG_SOC_NRF54L15_CPUFLPR OR CONFIG_SOC_NRF54L09_ENGA_CPUFLPR OR CONFIG_SOC_NRF54L20_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 index c24092f0f1ed..2e8398275ad3 100644 --- a/subsys/partition_manager/Kconfig +++ b/subsys/partition_manager/Kconfig @@ -130,9 +130,10 @@ endif config PM_PARTITION_SIZE_VPR_LAUNCHER hex - depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR + depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_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/rram-controller@5004e000/rram@ee000) if SOC_NRF54L09_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. @@ -211,16 +212,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 # 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 0x20000000 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_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 # 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 0x40000 if SOC_NRF54L20_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l20_enga_cpuflpr.dtsi + default 0x7fc00 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) From 9d1728bded155e1910db431ce2b3a2a2424a9e84 Mon Sep 17 00:00:00 2001 From: Adam Kondraciuk Date: Mon, 24 Mar 2025 15:42:49 +0100 Subject: [PATCH 2/2] manifest: Update sdk-zephyr revision Added missing entries for nRF54L09 CPUFLPR target Signed-off-by: Adam Kondraciuk --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 54149b0f5434..2d7b589e0580 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 060c3f43e430d34d3fc188b7c6bd524c3a3334f8 + revision: a80a94e07ab07ff2597060c0d711b7344018333b import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above