dfu: dfu_multi_image support for nRF54H20

This commit adds support for the nRF54H20 SoC
in the build system.

Signed-off-by: Artur Hadasz <[email protected]>

Author: ahasztag

samples/dfu/dfu_multi_image/Kconfig.sysbuild

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+config SOC_SERIES_NRF53X
+	select MCUBOOT_NRF53_MULTI_IMAGE_UPDATE
+	select SECURE_BOOT_NETCORE
+	select NETCORE_APP_UPDATE
+
+if SOC_SERIES_NRF53X
+
+choice MCUBOOT_MODE
+	default MCUBOOT_MODE_OVERWRITE_ONLY
+endchoice
+
+endif # SOC_SERIES_NRF53X
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

samples/dfu/dfu_multi_image/README.rst

@@ -13,7 +13,7 @@ Currently, it only supports DFU targets for MCUboot as its backend.
 Requirements
 ************
 
-The sample supports the following development kit:
+The sample supports the following development kits:
 
 .. table-from-sample-yaml::
 
@@ -80,6 +80,8 @@ Testing
    +===================+==================+
    | nRF5340 DK        | ``0xb8000``      |
    +-------------------+------------------+
+   | nRF54H20 DK       | ``0xe134000``    |
+   +-------------------+------------------+
 
 #. Upload the second version of the images to the device using ``nrfutil device``:
 
@@ -138,6 +140,11 @@ Testing
 
    The build time should reflect the new version in both cases.
 
+#. To make the update permanent, use the ``dfu_multi_image mcuboot_confirm <image_number>`` command.
+   This step is optional and not applicable to the nRF5340 DK.
+   ``<image_number>`` is ``0`` for the application core and ``1`` for the network core.
+   Without this step, any image that is not confirmed will revert to the previous image on the next reboot.
+
 Dependencies
 ************
 

samples/dfu/dfu_multi_image/boards/nrf54h20dk_nrf54h20_cpuapp.conf

@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

samples/dfu/dfu_multi_image/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+ #include "../sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi"
+
+slot0_partition: &cpuapp_slot0_partition {
+	label = "image-0";
+};
+
+slot1_partition: &cpuapp_slot1_partition {
+	label = "image-1";
+};
+
+slot2_partition: &cpurad_slot0_partition {
+	label = "image-2";
+};
+
+slot3_partition: &cpurad_slot1_partition {
+	label = "image-3";
+};

samples/dfu/dfu_multi_image/sample.yaml

@@ -8,7 +8,9 @@ sample:
   description: DFU multi image sample application
   name: dfu_multi_image sample
 common:
-  platform_allow: nrf5340dk/nrf5340/cpuapp
+  platform_allow:
+    - nrf5340dk/nrf5340/cpuapp
+    - nrf54h20dk/nrf54h20/cpuapp
   build_only: true
   sysbuild: true
 tests:
@@ -18,6 +20,7 @@ tests:
       - ci_samples_dfu
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
   sample.dfu.dfu_multi_image.save_progress:
     extra_configs:
       - CONFIG_DFU_TARGET_STREAM_SAVE_PROGRESS=y
@@ -29,3 +32,13 @@ tests:
       - ci_samples_dfu
     integration_platforms:
       - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp
+  sample.dfu.dfu_multi_image.encryption:
+    extra_args:
+      - SB_CONFIG_BOOT_ENCRYPTION=y
+    tags:
+      - dfu_multi_image
+      - ci_samples_dfu
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf54h20dk/nrf54h20/cpuapp

samples/dfu/dfu_multi_image/src/dfu_multi_image_shell.c

@@ -13,16 +13,22 @@
 #include <dfu/dfu_multi_image.h>
 #include <zephyr/dfu/mcuboot.h>
 
+#ifdef CONFIG_PARTITION_MANAGER_ENABLED
 #include <pm_config.h>
+#endif
 
 #include "dfu_multi_image_sample_common.h"
 
 #ifdef CONFIG_PARTITION_MANAGER_ENABLED
 #define DFU_MULTI_IMAGE_HELPER_ADDRESS PM_DFU_MULTI_IMAGE_HELPER_ADDRESS
-#define DFU_TARGET_HELPER_SIZE PM_DFU_MULTI_IMAGE_HELPER_SIZE
+#define DFU_MULTI_IMAGE_HELPER_SIZE PM_DFU_MULTI_IMAGE_HELPER_SIZE
 #else
-#define DFU_MULTI_IMAGE_HELPER_ADDRESS DT_REG_ADDR(DT_ALIAS(dfu_multi_image_helper))
-#define DFU_TARGET_HELPER_SIZE DT_REG_SIZE(DT_ALIAS(dfu_multi_image_helper))
+#define DFU_MULTI_IMAGE_HELPER_CONTAINER_ADDRESS \
+	DT_REG_ADDR(DT_GPARENT(DT_ALIAS(dfu_multi_image_helper)))
+#define DFU_MULTI_IMAGE_HELPER_OFFSET DT_REG_ADDR(DT_ALIAS(dfu_multi_image_helper))
+#define DFU_MULTI_IMAGE_HELPER_ADDRESS ((uint32_t) DFU_MULTI_IMAGE_HELPER_CONTAINER_ADDRESS + \
+				   DFU_MULTI_IMAGE_HELPER_OFFSET)
+#define DFU_MULTI_IMAGE_HELPER_SIZE DT_REG_SIZE(DT_ALIAS(dfu_multi_image_helper))
 #endif
 
 static int cmd_dfu_multi_image_write(const struct shell *shell, size_t argc, char **argv)
@@ -186,6 +192,33 @@ static int cmd_dfu_multi_image_full_update(const struct shell *shell, size_t arg
 	return 0;
 }
 
+#ifndef CONFIG_MCUBOOT_IMGTOOL_OVERWRITE_ONLY
+static int cmd_dfu_multi_image_mcuboot_confirm(const struct shell *shell, size_t argc, char **argv)
+{
+	int ret = 0;
+	int img_num = -1;
+
+	if (argc != 2) {
+		shell_error(shell, "Usage: dfu_multi_image mcuboot_confirm <img_num>");
+		return -EINVAL;
+	}
+
+	img_num = shell_strtol(argv[1], 10, &ret);
+	if (ret != 0) {
+		shell_error(shell, "Invalid <img_num> argument");
+		return -EINVAL;
+	}
+	ret = boot_write_img_confirmed_multi(img_num);
+
+	if (ret < 0) {
+		shell_error(shell, "Failed to confirm current MCUBOOT image: %d", ret);
+		return ret;
+	}
+
+	return 0;
+}
+#endif
+
 /* Define the dfu_target subcommand group */
 SHELL_STATIC_SUBCMD_SET_CREATE(dfu_multi_image_cmds,
 	SHELL_CMD(write, NULL,
@@ -198,10 +231,14 @@ SHELL_STATIC_SUBCMD_SET_CREATE(dfu_multi_image_cmds,
 	SHELL_CMD(schedule_update, NULL, "Schedule update for the images in the uploaded package.",
 		  cmd_dfu_multi_image_schedule_update),
 	SHELL_CMD(reset, NULL, "Reset the dfu_multi_image state as well as all the underlying "
-			     "dfu_target states", cmd_dfu_multi_image_reset),
+		  "dfu_target states", cmd_dfu_multi_image_reset),
 	SHELL_CMD(full_update, NULL,
-			  "Perform all the steps to fully update the firmware from the NVM buffer",
-			  cmd_dfu_multi_image_full_update),
+		  "Perform all the steps to fully update the firmware from the NVM buffer",
+		  cmd_dfu_multi_image_full_update),
+#ifndef CONFIG_MCUBOOT_IMGTOOL_OVERWRITE_ONLY
+	SHELL_CMD(mcuboot_confirm, NULL, "Confirm one of the current MCUBOOT images",
+		  cmd_dfu_multi_image_mcuboot_confirm),
+#endif
 	SHELL_SUBCMD_SET_END
 );
 

samples/dfu/dfu_multi_image/sysbuild.cmake

@@ -1 +1,7 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
 set(empty_net_core_EXTRA_ZEPHYR_MODULES ${CMAKE_CURRENT_LIST_DIR}/modules/net_build_time_log  CACHE INTERNAL "")

samples/dfu/dfu_multi_image/sysbuild.conf

@@ -8,15 +8,6 @@ SB_CONFIG_BOOTLOADER_MCUBOOT=y
 SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_BUILD=y
 SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_APP=y
 SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_NET=y
-SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_MCUBOOT=y
-# Simulteanous update is performed - test is not supported
-SB_CONFIG_MCUBOOT_MODE_OVERWRITE_ONLY=y
 
 # Radio core build and update enable
-
 SB_CONFIG_NETCORE_EMPTY=y
-
-# nRF53 specific
-SB_CONFIG_MCUBOOT_NRF53_MULTI_IMAGE_UPDATE=y
-SB_CONFIG_SECURE_BOOT_NETCORE=y
-SB_CONFIG_NETCORE_APP_UPDATE=y

samples/dfu/dfu_multi_image/sysbuild/empty_net_core/boards/nrf5340dk_nrf5340_cpunet.conf

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+ #include "../../nrf54h20dk_nrf54h20_memory_map.dtsi"
+
+slot0_partition: &cpurad_slot0_partition {
+	label = "image-0";
+};
+
+slot1_partition: &cpurad_slot1_partition {
+	label = "image-1";
+};