Skip to content

Commit 6e5262f

Browse files
committed
[nrf fromlist] boards: nrf54h20dk: Limit app core FLASH_LOAD_SIZE
Upstream PR #: 91413 CONFIG_USE_DT_CODE_PARTITION had to be disabled to add MCUboot support. As a result, CONFIG_FLASH_LOAD_SIZE was left at zero, which means that the linker would claim all available MRAM for the app core. For now, we can't allow that, because the default nRF54H20 DK memory map divides MRAM between multiple cores in order to support various samples. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit 66b0151a5621267a40290c43f1079fe691cc4837)
1 parent 3847a87 commit 6e5262f

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

boards/nordic/nrf54h20dk/Kconfig.defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@ config MAX_THREAD_BYTES
1212
config ROM_START_OFFSET
1313
default 0x800 if BOOTLOADER_MCUBOOT
1414

15+
# Application core firmware must start at this offset when not using MCUboot.
16+
# However, the default 'zephyr,code-partition' in DT is set for MCUboot.
1517
config FLASH_LOAD_OFFSET
1618
default 0x2c000 if !USE_DT_CODE_PARTITION
1719

20+
# This is meant to span 'cpuapp_boot_partition' and 'cpuapp_slot0_partition'
21+
# in the default memory map.
22+
config FLASH_LOAD_SIZE
23+
default 0x64000 if !USE_DT_CODE_PARTITION
24+
1825
endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP
1926

2027
if BOARD_NRF54H20DK_NRF54H20_CPURAD

boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ toolchain:
1010
- zephyr
1111
sysbuild: true
1212
ram: 256
13-
flash: 296
13+
flash: 400
1414
supported:
1515
- adc
1616
- can

0 commit comments

Comments
 (0)