Skip to content

Commit fa4ac17

Browse files
committed
boards: nordic: nrf54l20pdk: Increase RAM, Flash on FLPR
Include sdk-zephyr from PR: nrfconnect/sdk-zephyr#2629 Align Partition Manager configuration. Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
1 parent 0d6ecb9 commit fa4ac17

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

Kconfig.nrf

+2-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ config FLASH_SIZE
117117
int
118118
depends on PARTITION_MANAGER_ENABLED
119119
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
120-
default 1524 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR
120+
default 1524 if SOC_NRF54L15_CPUFLPR
121+
default 2036 if SOC_NRF54L20_ENGA_CPUFLPR
121122
default 128 if SOC_NRF7120_ENGA_CPUFLPR
122123

123124
config NRF_SECURITY_ENABLER

subsys/partition_manager/Kconfig

+11-2
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,22 @@ config PM_PARTITION_SIZE_VPR_LAUNCHER
150150
hex
151151
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
152152
default $(dt_node_reg_addr_hex,/soc/rram-controller@5004b000/rram@165000) if SOC_NRF54L15_CPUFLPR
153-
default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@1ed000) if SOC_NRF54L20_ENGA_CPUFLPR
153+
default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@1e5000) if SOC_NRF54L20_ENGA_CPUFLPR
154154
default $(dt_node_reg_addr_hex,/soc/mram@3e1000) if SOC_NRF7120_ENGA_CPUFLPR
155155
help
156156
Memory set aside for the vpr_launcher partition.
157157
Must match the size of the cpuapp_rram/cpuapp_mram partition which is deleted.
158158
This to place the flpr app's code at the address found in the devicetree.
159159

160+
config PM_RAM_SIZE_VPR_LAUNCHER
161+
hex
162+
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
163+
default 0x28000 if SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
164+
default 0x67c00 if SOC_NRF54L20_ENGA_CPUFLPR
165+
help
166+
Size of RAM available for the vpr_launcher application (usually run on cpuapp).
167+
Must match the size of the cpuapp_sram node.
168+
160169
if WIFI_NRF70 && NRF_WIFI_PATCHES_EXT_FLASH_STORE
161170

162171
partition=NRF70_WIFI_FW
@@ -238,7 +247,7 @@ config PM_SRAM_SIZE
238247
hex
239248
default $(dt_node_reg_size_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET
240249
default 0x40000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi
241-
default 0x40000 if SOC_NRF54L20_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l20_enga_cpuflpr.dtsi
250+
default 0x7fc00 if SOC_NRF54L20_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l20_enga_cpuflpr.dtsi
242251
default 0x40000 if SOC_NRF7120_ENGA_CPUFLPR # Because the cpuapp_mram DT node is deleted in nrf7120_enga_cpuflpr.dtsi
243252
default $(dt_node_reg_size_hex,/soc/memory@20000000)
244253

subsys/partition_manager/pm.yml.vpr_launcher

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ vpr_launcher:
77
vpr_launcher_sram:
88
region: sram_primary
99
placement: {before: app}
10-
size: 0x28000
10+
size: CONFIG_PM_RAM_SIZE_VPR_LAUNCHER

west.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ manifest:
6666
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
6767
- name: zephyr
6868
repo-path: sdk-zephyr
69-
revision: 5319cfc0718146a1bb21a856415d9b50abbf979e
69+
revision: pull/2629/head
7070
import:
7171
# In addition to the zephyr repository itself, NCS also
7272
# imports the contents of zephyr/west.yml at the above

0 commit comments

Comments
 (0)