Skip to content

Commit 2307263

Browse files
rob-robinson-14nordicjm
authored andcommitted
partition_manager: Support building images for nRF7120_cpuflpr
Add case for cpuflpr_sram in PM_SRAM_(BASE|SIZE). This is needed because the dts files for cpuflpr deletes the cpuapp_sram and cpuapp_mram nodes. Signed-off-by: Robert Robinson <robert.robinson@nordicsemi.no>
1 parent be2fda7 commit 2307263

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

Kconfig.nrf

+10-5
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,20 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
104104
config GETOPT
105105
default n
106106

107-
# Temporary hack to be able to build samples and tests on the nRF51L15 FLPR core
108-
if SOC_NRF54L15_CPUFLPR && PARTITION_MANAGER_ENABLED
107+
# Temporary hack to be able to build samples and tests on the nRF51L15/nRF7120 FLPR core
109108
config FLASH_BASE_ADDRESS
110109
hex
111-
default 0x0
110+
depends on PARTITION_MANAGER_ENABLED
111+
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
112+
default 0x0 if SOC_NRF54L15_CPUFLPR
113+
default 0x2C0000 if SOC_NRF7120_ENGA_CPUFLPR
114+
112115
config FLASH_SIZE
113116
int
114-
default 1524
115-
endif
117+
depends on PARTITION_MANAGER_ENABLED
118+
depends on SOC_NRF54L15_CPUFLPR || SOC_NRF7120_ENGA_CPUFLPR
119+
default 1524 if SOC_NRF54L15_CPUFLPR
120+
default 128 if SOC_NRF7120_ENGA_CPUFLPR
116121

117122
config NRF_SECURITY_ENABLER
118123
def_bool y

subsys/partition_manager/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ if (CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_FLASH)
127127
ncs_add_partition_manager_config(pm.yml.modem_trace)
128128
endif()
129129

130-
if (CONFIG_SOC_NRF54L15_CPUFLPR)
130+
if (CONFIG_SOC_NRF54L15_CPUFLPR OR CONFIG_SOC_NRF7120_ENGA_CPUFLPR)
131131
ncs_add_partition_manager_config(pm.yml.vpr_launcher)
132132
endif()
133133

subsys/partition_manager/Kconfig

+14
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,18 @@ config PM_PARTITION_SIZE_VPR_LAUNCHER
156156
This to place the flpr app's code at the address found in the devicetree.
157157
endif
158158

159+
if SOC_NRF7120_ENGA_CPUFLPR
160+
161+
config PM_PARTITION_SIZE_VPR_LAUNCHER
162+
hex
163+
default $(dt_node_reg_addr_hex,/soc/mram@3e1000)
164+
help
165+
Memory set aside for the vpr_launcher partition.
166+
Must match the size of the cpuapp_mram partition which is deleted.
167+
This to place the flpr app's code at the address found in the devicetree.
168+
169+
endif
170+
159171
if WIFI_NRF70 && NRF_WIFI_PATCHES_EXT_FLASH_STORE
160172

161173
partition=NRF70_WIFI_FW
@@ -229,12 +241,14 @@ config PM_SRAM_BASE
229241
hex
230242
default $(dt_node_reg_addr_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET
231243
default 0x20000000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf54l15_cpuflpr.dtsi
244+
default 0x20000000 if SOC_NRF7120_ENGA_CPUFLPR # Because the cpuapp_sram DT node is deleted in nrf7120_enga_cpuflpr.dtsi
232245
default $(dt_node_reg_addr_hex,/soc/memory@20000000)
233246

234247
config PM_SRAM_SIZE
235248
hex
236249
default $(dt_node_reg_size_hex,/soc/memory@21000000) if SOC_NRF5340_CPUNET
237250
default 0x40000 if SOC_NRF54L15_CPUFLPR # Because the cpuapp_rram DT node is deleted in nrf54l15_cpuflpr.dtsi
251+
default 0x40000 if SOC_NRF7120_ENGA_CPUFLPR # Because the cpuapp_mram DT node is deleted in nrf7120_enga_cpuflpr.dtsi
238252
default $(dt_node_reg_size_hex,/soc/memory@20000000)
239253

240254
config PM_USE_CONFIG_SRAM_SIZE

0 commit comments

Comments
 (0)