dfu: Added support for dfu_target with nRF54H20

This commit introduces the changes required to support
dfu target with nRF54H20. The dfu_target sample is also
extended.

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

Author: ahasztag

CODEOWNERS

@@ -784,6 +784,7 @@
 /subsys/debug/                            @nordic-krch
 /subsys/debug/coredump/                   @nrfconnect/ncs-protocols-serialization
 /subsys/dfu/                              @nrfconnect/ncs-pluto
+/subsys/dfu/dfu_target/                   @nrfconnect/ncs-pluto @nrfconnect/ncs-charon
 /subsys/dfu/dfu_multi_image/              @Damian-Nordic @nrfconnect/ncs-charon
 /subsys/dm/                               @nrfconnect/ncs-si-muffin
 /subsys/dult/                             @nrfconnect/ncs-si-bluebagel

samples/dfu/dfu_target/README.rst

@@ -75,6 +75,8 @@ After programming the sample to your development kit, perform the following step
    +===================+==================+
    | nRF52840 DK       | ``0xa8000``      |
    +-------------------+------------------+
+   | nRF54H20 DK       | ``0xe092000``    |
+   +-------------------+------------------+
 
 #. Upload the second version of the image to the device using ``nrfutil device``:
 

samples/dfu/dfu_target/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/* This sample does not use the radio core, so the radio partition ca be reused */
+/delete-node/ &cpurad_slot0_partition;
+
+/ {
+	aliases {
+		dfu-target-helper = &dfu_target_helper_partition;
+	};
+};
+
+&mram1x {
+	partitions {
+		dfu_target_helper_partition: partition@92000 {
+			label = "helper";
+			reg = <0x92000 DT_SIZE_K(328)>;
+		};
+	};
+};

samples/dfu/dfu_target/sample.yaml

@@ -8,7 +8,9 @@ sample:
   description: DFU target sample application
   name: dfu_target sample
 common:
-  platform_allow: nrf52840dk/nrf52840
+  platform_allow:
+    - nrf52840dk/nrf52840
+    - nrf54h20dk/nrf54h20/cpuapp
   build_only: true
   sysbuild: true
 tests:
@@ -18,3 +20,4 @@ tests:
       - ci_samples_dfu
     integration_platforms:
       - nrf52840dk/nrf52840
+      - nrf54h20dk/nrf54h20/cpuapp

samples/dfu/dfu_target/src/dfu_target_shell.c

@@ -14,15 +14,20 @@
 #include <dfu/dfu_target_mcuboot.h>
 #include <zephyr/dfu/mcuboot.h>
 
+#ifdef CONFIG_PARTITION_MANAGER_ENABLED
 #include <pm_config.h>
+#endif
 
 #define STREAM_BUF_SIZE 256
 
 #ifdef CONFIG_PARTITION_MANAGER_ENABLED
 #define DFU_TARGET_HELPER_ADDRESS PM_DFU_TARGET_HELPER_ADDRESS
 #define DFU_TARGET_HELPER_SIZE PM_DFU_TARGET_HELPER_SIZE
 #else
-#define DFU_TARGET_HELPER_ADDRESS DT_REG_ADDR(DT_ALIAS(dfu_target_helper))
+#define DFU_TARGET_HELPER_CONTAINER_ADDRESS DT_REG_ADDR(DT_GPARENT(DT_ALIAS(dfu_target_helper)))
+#define DFU_TARGET_HELPER_OFFSET DT_REG_ADDR(DT_ALIAS(dfu_target_helper))
+#define DFU_TARGET_HELPER_ADDRESS ((uint32_t) DFU_TARGET_HELPER_CONTAINER_ADDRESS + \
+				   DFU_TARGET_HELPER_OFFSET)
 #define DFU_TARGET_HELPER_SIZE DT_REG_SIZE(DT_ALIAS(dfu_target_helper))
 #endif
 

subsys/dfu/dfu_target/src/dfu_target_mcuboot.c

@@ -17,7 +17,11 @@
 #include <string.h>
 
 #include <zephyr/kernel.h>
+#ifdef CONFIG_PARTITION_MANAGER_ENABLED
 #include <pm_config.h>
+#else
+#include <zephyr/storage/flash_map.h>
+#endif
 #include <zephyr/logging/log.h>
 #include <zephyr/dfu/mcuboot.h>
 #include <dfu/dfu_target.h>
@@ -31,6 +35,8 @@ LOG_MODULE_REGISTER(dfu_target_mcuboot, CONFIG_DFU_TARGET_LOG_LEVEL);
 
 #define IS_ALIGNED_32(POINTER) (((uintptr_t)(const void *)(POINTER)) % 4 == 0)
 
+#ifdef CONFIG_PARTITION_MANAGER_ENABLED
+
 #define _MB_SEC_PAT(i, x) PM_MCUBOOT_SECONDARY_ ## i ## _ ## x
 
 #define _MB_SEC_PAT_STRING(i, x) STRINGIFY(PM_MCUBOOT_SECONDARY_ ## i ## _ ## x)
@@ -44,8 +50,6 @@ LOG_MODULE_REGISTER(dfu_target_mcuboot, CONFIG_DFU_TARGET_LOG_LEVEL);
 
 #define _MB_SEC_LA(i, _) _H_MB_SEC_LA(i)
 
-#define _STR_TARGET_NAME(i, _) STRINGIFY(MCUBOOT##i)
-
 #ifdef PM_MCUBOOT_SECONDARY_2_ID
 	#define TARGET_IMAGE_COUNT 3
 #elif defined(PM_MCUBOOT_SECONDARY_1_ID)
@@ -62,6 +66,36 @@ LOG_MODULE_REGISTER(dfu_target_mcuboot, CONFIG_DFU_TARGET_LOG_LEVEL);
 #define PM_MCUBOOT_SECONDARY_0_NAME	STRINGIFY(PM_MCUBOOT_SECONDARY_NAME)
 #define PM_MCUBOOT_SECONDARY_0_DEV	PM_MCUBOOT_SECONDARY_DEV
 
+#else /* CONFIG_PARTITION_MANAGER_ENABLED */
+
+/**
+ * These definitions are named to align with those used when Partition Manager
+ * is enabled, ensuring compatibility for use in the array definitions below.
+ */
+
+/**
+ * The labels are defined: slot1_partition for image 0, slot3_partition for image 1, etc.
+ */
+#define SEC_PAT_NODELABEL(i) UTIL_CAT(slot, UTIL_CAT(UTIL_INC(UTIL_X2(i)), _partition))
+
+#define SEC_PAT_ADDRESS(i) FIXED_PARTITION_OFFSET(SEC_PAT_NODELABEL(i))
+
+#define SEC_PAT_SIZE(i) FIXED_PARTITION_SIZE(SEC_PAT_NODELABEL(i))
+
+#define _MB_SEC_PAT(i, x) UTIL_CAT(SEC_PAT_, x)(i)
+
+/* Ignore the 'x' parameter, it is needed for compatibility with Partition Manager scenarios. */
+#define _MB_SEC_PAT_DEV(i, x) FIXED_PARTITION_DEVICE(SEC_PAT_NODELABEL(i))
+
+/* Ignore the 'x' parameter, it is needed for compatibility with Partition Manager scenarios. */
+#define _MB_SEC_PAT_STRING(i, x) STRINGIFY(SEC_PAT_NODELABEL(i))
+
+#define TARGET_IMAGE_COUNT CONFIG_UPDATEABLE_IMAGE_NUMBER
+
+#endif /* CONFIG_PARTITION_MANAGER_ENABLED */
+
+#define _STR_TARGET_NAME(i, _) STRINGIFY(MCUBOOT##i)
+
 static const size_t secondary_size[] = {
 	LIST_DROP_EMPTY(LISTIFY(TARGET_IMAGE_COUNT, _MB_SEC_PAT, (,), SIZE))
 };