From bed60b258eb5a165fc667a2786f491b07e55fec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20G=C5=82=C4=85b?= Date: Tue, 18 Mar 2025 08:48:21 +0100 Subject: [PATCH] boards: nordic: nrf54l20pdk: Increase RAM, Flash on FLPR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Include sdk-zephyr from PR: https://github.com/nrfconnect/sdk-zephyr/pull/2629 Align Partition Manager configuration. Signed-off-by: Sebastian Głąb --- Kconfig.nrf | 3 ++- subsys/partition_manager/Kconfig | 13 +++++++++++-- subsys/partition_manager/pm.yml.vpr_launcher | 2 +- west.yml | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Kconfig.nrf b/Kconfig.nrf index 80a9aa88d4df..166180dca364 100644 --- a/Kconfig.nrf +++ b/Kconfig.nrf @@ -117,7 +117,8 @@ 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 + 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/Kconfig b/subsys/partition_manager/Kconfig index f0f4b2de991c..42ea1cc7bfc1 100644 --- a/subsys/partition_manager/Kconfig +++ b/subsys/partition_manager/Kconfig @@ -150,13 +150,22 @@ config PM_PARTITION_SIZE_VPR_LAUNCHER hex 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/rram-controller@5004e000/rram@1e5000) 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/cpuapp_mram partition which is deleted. This to place the flpr app's code at the address found in the devicetree. +config PM_RAM_SIZE_VPR_LAUNCHER + hex + depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR + default 0x28000 if SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR + default 0x67c00 if SOC_NRF54L20_ENGA_CPUFLPR + help + Size of RAM available for the vpr_launcher application (usually run on cpuapp). + Must match the size of the cpuapp_sram node. + if WIFI_NRF70 && NRF_WIFI_PATCHES_EXT_FLASH_STORE partition=NRF70_WIFI_FW @@ -238,7 +247,7 @@ 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 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) diff --git a/subsys/partition_manager/pm.yml.vpr_launcher b/subsys/partition_manager/pm.yml.vpr_launcher index ff00e2a01dd4..d388dcd45f48 100644 --- a/subsys/partition_manager/pm.yml.vpr_launcher +++ b/subsys/partition_manager/pm.yml.vpr_launcher @@ -7,4 +7,4 @@ vpr_launcher: vpr_launcher_sram: region: sram_primary placement: {before: app} - size: 0x28000 + size: CONFIG_PM_RAM_SIZE_VPR_LAUNCHER diff --git a/west.yml b/west.yml index fbec8c7fb330..9d6f0f205c04 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: 7684f5879a4373cff03f8f3abf4378ec8643cadf + revision: pull/2629/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above