From 8a66e1544d8f8cabfa431e39fd2c3cece0766ffa Mon Sep 17 00:00:00 2001 From: Michal Kozikowski Date: Wed, 25 Jun 2025 17:21:33 +0200 Subject: [PATCH] [nrf fromlist] boards: nordic: nrf54h20dk: Fix FLASH_LOAD_SIZE Fix FLASH_LOAD_SIZE setting for builds with !USE_DT_CODE_PARTITION (for e.g. with no MCUBoot). Having it wrongly set to 0x0 caused problems when running multiple images (radio core, application core) on the same board. Upstream PR #: 92191 Related: NCSIDB-1628 Signed-off-by: Michal Kozikowski --- boards/nordic/nrf54h20dk/Kconfig.defconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig index f55de22275c5..d2ee54d47827 100644 --- a/boards/nordic/nrf54h20dk/Kconfig.defconfig +++ b/boards/nordic/nrf54h20dk/Kconfig.defconfig @@ -1,6 +1,9 @@ # Copyright (c) 2024 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 +# Workaround for not being able to have commas in macro arguments +DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition + if BOARD_NRF54H20DK_NRF54H20_CPUAPP config BT_HCI_IPC @@ -26,6 +29,9 @@ config ROM_START_OFFSET config FLASH_LOAD_OFFSET default 0x30000 if !USE_DT_CODE_PARTITION +config FLASH_LOAD_SIZE + default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if !USE_DT_CODE_PARTITION + endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON if BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON