Skip to content
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

Nrfx none n rf54 l09 align #21121

Merged
merged 2 commits into from
Mar 27, 2025
Merged

Nrfx none n rf54 l09 align #21121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8a9a45
partition_manager: Add support for nRF54L09 Enga cpuflpr
adamkondraciuk Mar 24, 2025
9d1728b
manifest: Update sdk-zephyr revision
adamkondraciuk Mar 24, 2025
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: 7 additions & 5 deletions Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,19 +106,21 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
config GETOPT
default n

# Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L20 Eng A/nRF7120 FLPR core
# Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54L20 Eng A/nRF7120 FLPR core
config FLASH_BASE_ADDRESS
hex
depends on PARTITION_MANAGER_ENABLED
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 0x0 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR
default 0x2C0000 if SOC_NRF7120_ENGA_CPUFLPR

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
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
default 1012 if SOC_NRF54L09_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
2 changes: 1 addition & 1 deletion subsys/partition_manager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,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_NRF54L20_ENGA_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
if (CONFIG_SOC_NRF54L15_CPUFLPR OR CONFIG_SOC_NRF54L09_ENGA_CPUFLPR OR CONFIG_SOC_NRF54L20_ENGA_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
ncs_add_partition_manager_config(pm.yml.vpr_launcher)
endif()

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

config PM_PARTITION_SIZE_VPR_LAUNCHER
hex
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L20_ENGA_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_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@ee000) if SOC_NRF54L09_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.
Expand Down Expand Up @@ -211,16 +212,15 @@ 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 # Because the cpuapp_sram DT node is deleted in nrf54l15_cpuflpr.dtsi
default 0x20000000 if SOC_NRF54L20_ENGA_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf54l20_enga_cpuflpr.dtsi
default 0x20000000 if SOC_NRF7120_ENGA_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf7120_enga_cpuflpr.dtsi
default 0x20000000 if SOC_NRF54L15_CPUFLPR || SOC_NRF54L09_ENGA_CPUFLPR || SOC_NRF54L20_ENGA_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_NRF54L09_ENGA_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l09_enga_cpuflpr.dtsi
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 west.yml
View file
Open in desktop
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: 060c3f43e430d34d3fc188b7c6bd524c3a3334f8
revision: a80a94e07ab07ff2597060c0d711b7344018333b
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading