Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Kconfig.nrf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions subsys/partition_manager/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Comment on lines +165 to +167
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is nordic-flprsnippet that adds building of vpr_launcher.
It changes SRAM partitioning.

Value of 160k / 0x28000 is set here:
https://github.com/nrfconnect/sdk-zephyr/blob/main/snippets/nordic-flpr/soc/nrf54l15_cpuapp.overlay#L32

Not sure why it's done this way.


if WIFI_NRF70 && NRF_WIFI_PATCHES_EXT_FLASH_STORE

partition=NRF70_WIFI_FW
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion subsys/partition_manager/pm.yml.vpr_launcher
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ vpr_launcher:
vpr_launcher_sram:
region: sram_primary
placement: {before: app}
size: 0x28000
size: CONFIG_PM_RAM_SIZE_VPR_LAUNCHER
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading