boards: nrf54h20_iron: Allow radio updates

Add necessary changes to provide a simple, updateable radio image.

Ref: NCSDK-33316

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

boards/nordic/nrf54h20dk/Kconfig.defconfig

@@ -27,3 +27,10 @@ config FLASH_LOAD_OFFSET
 	default 0x2c000 if !USE_DT_CODE_PARTITION
 
 endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP_IRON
+
+if BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON
+
+config ROM_START_OFFSET
+	default 0x800 if BOOTLOADER_MCUBOOT
+
+endif # BOARD_NRF54H20DK_NRF54H20_CPURAD_IRON

boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_iron.dts

@@ -35,3 +35,11 @@ slot0_partition: &cpuapp_slot0_partition {
 slot1_partition: &cpuapp_slot1_partition {
 	label = "image-1";
 };
+
+slot2_partition: &cpurad_slot0_partition {
+	label = "image-2";
+};
+
+slot3_partition: &cpurad_slot1_partition {
+	label = "image-3";
+};

boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_iron.dts

@@ -19,3 +19,11 @@
 	mbox-names = "tx", "rx";
 	status = "okay";
 };
+
+slot0_partition: &cpurad_slot0_partition {
+	label = "image-0";
+};
+
+slot1_partition: &cpurad_slot1_partition {
+	label = "image-1";
+};

modules/Kconfig.mcuboot

@@ -227,6 +227,7 @@ config MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP
 
 config MCUBOOT_BOOTLOADER_MODE_DIRECT_XIP_WITH_REVERT
 	bool "MCUboot has been configured for DirectXIP with revert"
+	select MCUBOOT_BOOTUTIL_LIB
 	select MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
 	select MCUBOOT_BOOTLOADER_MODE_HAS_NO_DOWNGRADE
 	select MCUBOOT_BOOTLOADER_NO_DOWNGRADE

samples/subsys/mgmt/mcumgr/smp_svr/sample.yaml

@@ -230,3 +230,10 @@ tests:
       - nrf5340dk/nrf5340/cpuapp
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
+  sample.mcumgr.smp_svr.serial.empty_radio.nrf54h20_iron:
+    extra_args:
+      - EXTRA_CONF_FILE="overlay-serial.conf"
+      - SB_CONFIG_NETCORE_EMPTY=y
+      - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp/iron

soc/nordic/nrf54h/Kconfig

@@ -77,6 +77,22 @@ config SOC_NRF54H20_CPURAD_ENABLE
 	  Radiocore, and also power will be requested to the Radiocore
 	  subsystem. The Radiocore will then start executing instructions.
 
+config SOC_NRF54H20_CPURAD_ROM_START_OFFSET
+	hex
+	prompt "ROM start offset" if !BOOTLOADER_MCUBOOT
+	default 0x800 if BOOTLOADER_MCUBOOT
+	default 0
+	depends on SOC_NRF54H20_CPURAD_ENABLE
+	help
+	  If the radio is built for chain-loading by an application this
+	  variable is required to be set to value that leaves sufficient
+	  space between the beginning of the radio image and the start of
+	  the first section to store an image header or any other metadata.
+	  In the particular case of the MCUboot bootloader this reserves enough
+	  space to store the image header, which should also meet vector table
+	  alignment requirements on most ARM targets, although some targets
+	  may require smaller or larger values.
+
 config SOC_NRF54H20_CPURAD
 	select SOC_NRF54H20_CPURAD_COMMON
 

soc/nordic/nrf54h/soc.c

@@ -173,7 +173,8 @@ void soc_late_init_hook(void)
 
 	void *radiocore_address =
 		(void *)(DT_REG_ADDR(DT_GPARENT(DT_NODELABEL_CPURAD_SLOT0_PARTITION)) +
-				 DT_REG_ADDR(DT_NODELABEL_CPURAD_SLOT0_PARTITION));
+			 DT_REG_ADDR(DT_NODELABEL_CPURAD_SLOT0_PARTITION) +
+			 CONFIG_SOC_NRF54H20_CPURAD_ROM_START_OFFSET);
 
 	/* Don't wait as this is not yet supported. */
 	bool cpu_wait = false;