Skip to content
Merged
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
12 changes: 12 additions & 0 deletions subsys/partition_manager/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,18 @@ config PM_PARTITION_SIZE_VPR_LAUNCHER
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_NRF54L09_ENGA_CPUFLPR || SOC_NRF54LV10A_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF54LM20A_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 0x28000 if SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
Copy link
Contributor Author

Choose a reason for hiding this comment

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

0x28000 for L15 is set here https://github.com/nrfconnect/sdk-zephyr/blob/main/snippets/nordic-flpr/soc/nrf54l15_cpuapp.overlay#L17

I don't know what is the correct value for nRF7120.

Copy link
Contributor

Choose a reason for hiding this comment

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

Those values are redundant, already in DT. I was wondering if you could use something like:

default $(int2hex,$(sub,$(dt_nodelabel_reg_addr_int,cpuflpr_sram),536870912/*0x20000000*/))

We are in flpr Kconfig so cpuapp_sram cannot be used. Note that currently there is no int2hex function available but i've tried to add it and it is quite easy.

Copy link
Contributor

Choose a reason for hiding this comment

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

it's already in upstream: zephyrproject-rtos/zephyr#91552

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Currently, I get build error.

Traceback (most recent call last):
  File "/home/segl/workspace/ncs/zephyr/scripts/kconfig/kconfiglib.py", line 2786, in _expand_macro
    res += args[int(new_args[0])]
                ^^^^^^^^^^^^^^^^
ValueError: invalid literal for int() with base 10: 'sub'

Let's use hardcoded values for now and improve it later.

default 0x23c00 if SOC_NRF54L09_ENGA_CPUFLPR
Copy link
Contributor Author

Choose a reason for hiding this comment

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

default 0x1fc00 if SOC_NRF54LV10A_ENGA_CPUFLPR
Copy link
Contributor Author

Choose a reason for hiding this comment

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

default 0x6fc00 if SOC_NRF54L20_ENGA_CPUFLPR
Copy link
Contributor Author

Choose a reason for hiding this comment

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

default 0x67c00 if SOC_NRF54LM20A_ENGA_CPUFLPR
Copy link
Contributor Author

Choose a reason for hiding this comment

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

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
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
Loading