Skip to content

sysbuild: enable lm20b FLPR + PM #27738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nordic-piks wants to merge 1 commit into from
Closed

sysbuild: enable lm20b FLPR + PM #27738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions subsys/partition_manager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ if(CONFIG_NRF_MODEM_LIB)
endif()

if(CONFIG_SOC_NRF54L15_CPUAPP OR CONFIG_SOC_NRF54L05_CPUAPP OR
CONFIG_SOC_NRF54L10_CPUAPP OR CONFIG_SOC_NRF54LM20A_CPUAPP)
CONFIG_SOC_NRF54L10_CPUAPP OR CONFIG_SOC_NRF54LM20A_CPUAPP OR
CONFIG_SOC_NRF54LM20B_CPUAPP)
ncs_add_partition_manager_config(pm.yml.bootconf)
endif()

Expand Down Expand Up @@ -140,7 +141,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_NRF54LM20A_CPUFLPR OR CONFIG_SOC_NRF54LV10A_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
if(CONFIG_SOC_NRF54L15_CPUFLPR OR CONFIG_SOC_NRF54LM20A_CPUFLPR OR CONFIG_SOC_NRF54LM20B_CPUFLPR OR CONFIG_SOC_NRF54LV10A_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
ncs_add_partition_manager_config(pm.yml.vpr_launcher)
endif()

Expand Down
16 changes: 10 additions & 6 deletions subsys/partition_manager/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ endif

config PM_PARTITION_SIZE_VPR_LAUNCHER
hex
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54LV10A_CPUFLPR || SOC_NRF54LM20A_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54LV10A_CPUFLPR || \
SOC_NRF54LM20A_CPUFLPR || SOC_NRF54LM20B_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@1e5000) if SOC_NRF54LM20A_CPUFLPR
default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@1e5000) if SOC_NRF54LM20A_CPUFLPR || \
SOC_NRF54LM20B_CPUFLPR
default $(dt_node_reg_addr_hex,/soc/rram-controller@5004e000/rram@ed000) if SOC_NRF54LV10A_CPUFLPR
default $(dt_node_reg_addr_hex,/soc/mram@3e1000) if SOC_NRF7120_ENGA_CPUFLPR
help
Expand All @@ -127,10 +129,11 @@ config PM_PARTITION_SIZE_VPR_LAUNCHER

config PM_RAM_SIZE_VPR_LAUNCHER
hex
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54LV10A_CPUFLPR || SOC_NRF54LM20A_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54LV10A_CPUFLPR || \
SOC_NRF54LM20A_CPUFLPR || SOC_NRF54LM20B_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 0x28000 if SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 0x1fc00 if SOC_NRF54LV10A_CPUFLPR
default 0x67c00 if SOC_NRF54LM20A_CPUFLPR
default 0x67c00 if SOC_NRF54LM20A_CPUFLPR || SOC_NRF54LM20B_CPUFLPR
help
Size of RAM available for the vpr_launcher application (usually run on cpuapp).
Must match the size of the cpuapp_sram node.
Expand Down Expand Up @@ -207,15 +210,16 @@ 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 || SOC_NRF54LV10A_CPUFLPR || SOC_NRF54LM20A_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 0x20000000 if SOC_NRF54L15_CPUFLPR || SOC_NRF54LV10A_CPUFLPR || \
SOC_NRF54LM20A_CPUFLPR || SOC_NRF54LM20B_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_NRF54LV10A_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54lv10a_cpuflpr.dtsi
default 0x40000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi
default 0x7fc00 if SOC_NRF54LM20A_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54lm20a_cpuflpr.dtsi
default 0x7fc00 if SOC_NRF54LM20A_CPUFLPR || SOC_NRF54LM20B_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54lm20a_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.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# TF-M non-secure application to avoid splitting the secure/non-secure
# partitions more than necessary.
#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LV10A_CPUAPP) || \
defined(CONFIG_SOC_NRF54LM20A_CPUAPP)
defined(CONFIG_SOC_NRF54LM20A_CPUAPP) || defined(CONFIG_SOC_NRF54LM20B_CPUAPP)
settings_storage:
placement:
after: [app]
Expand Down
3 changes: 2 additions & 1 deletion subsys/partition_manager/pm.yml.tfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ tfm_storage:
# TF-M non-secure application to avoid splitting the secure/non-secure
# partitions more than necessary.
#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LV10A_CPUAPP) || \
defined(CONFIG_SOC_NRF54LM20A_CPUAPP) || defined(CONFIG_SOC_NRF7120_ENGA_CPUAPP)
defined(CONFIG_SOC_NRF54LM20A_CPUAPP) || defined(CONFIG_SOC_NRF54LM20B_CPUAPP) || \
defined(CONFIG_SOC_NRF7120_ENGA_CPUAPP)

tfm_ps:
placement:
Expand Down
2 changes: 1 addition & 1 deletion subsys/partition_manager/pm.yml.zms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# In nRF54L15 we place the TF-M non-secure storage partitions after the
# TF-M non-secure application to avoid splitting the secure/non-secure
# partitions more than necessary.
#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LM20A_CPUAPP)
#if defined(CONFIG_SOC_NRF54L15_CPUAPP) || defined(CONFIG_SOC_NRF54LM20A_CPUAPP) || defined(CONFIG_SOC_NRF54LM20B_CPUAPP)
zms_storage:
placement:
after: [app]
Expand Down
4 changes: 3 additions & 1 deletion sysbuild/Kconfig.flprcore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

config SUPPORT_FLPRCORE
bool
default y if (SOC_NRF54L15_CPUAPP || SOC_NRF54H20_CPUAPP || SOC_NRF54LM20A_CPUAPP || SOC_NRF7120_ENGA_CPUAPP)
default y if (SOC_NRF54L15_CPUAPP || SOC_NRF54H20_CPUAPP || \
SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP || \
SOC_NRF7120_ENGA_CPUAPP)

if SUPPORT_FLPRCORE

Expand Down
2 changes: 1 addition & 1 deletion sysbuild/Kconfig.secureboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ config SECURE_BOOT_BOOTCONF_LOCK_WRITES_SUPPORTED
bool
default y if SOC_NRF54L15_CPUAPP || SOC_NRF54L05_CPUAPP || SOC_NRF54L10_CPUAPP
default y if SOC_NRF54LV10A_CPUAPP
default y if SOC_NRF54LM20A_CPUAPP
default y if SOC_NRF54LM20A_CPUAPP || SOC_NRF54LM20B_CPUAPP

config SECURE_BOOT_BOOTCONF_LOCK_WRITES
bool "Protect bootloader's NVM from writes"
Expand Down
Loading