applications: nrf_desktop: nrf54h20: use mapped-partition binding

Align the nrf54h20dk/nrf54h20/cpuapp memory map overlay with the
platform's expected partition binding. After the Zephyr Kconfig rework
that stopped subtracting zephyr,flash base from
CONFIG_FLASH_LOAD_OFFSET, "fixed-partitions" caused MCUboot and
the application image to be linked outside MRAM.

Ref: NCSDK-39186

Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>

Author: maje-emb

applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/memory_map.dtsi

@@ -9,7 +9,6 @@
 
 	/* Redefine the "partitions" DTS node. */
 	partitions {
-		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
@@ -19,24 +18,27 @@
 		 */
 
 		cpuapp_boot_partition: partition@30000 {
+			compatible = "zephyr,mapped-partition";
 			reg = <0x30000 DT_SIZE_K(32)>;
 		};
 
 		/* When using merged slots, the definition of MCUboot slots is common for all
 		 * images and points to the "merged" partition.
 		 */
 		slot0_partition: partition@38000 {
-			compatible = "fixed-subpartitions";
+			compatible = "zephyr,mapped-partition";
 			reg = <0x38000 DT_SIZE_K(800)>;
 			ranges = <0x0 0x38000 DT_SIZE_K(800)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 
 			cpuapp_slot0_partition: partition@800 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x800 DT_SIZE_K(330)>;
 			};
 
 			cpurad_slot0_partition: partition@53000 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x53000 DT_SIZE_K(220)>;
 			};
 
@@ -50,17 +52,19 @@
 		/* Partitions belonging to the MRAM_11 memory block. */
 
 		slot1_partition: partition@100000 {
-			compatible = "fixed-subpartitions";
+			compatible = "zephyr,mapped-partition";
 			reg = <0x100000 DT_SIZE_K(800)>;
 			ranges = <0x0 0x100000 DT_SIZE_K(800)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 
 			cpuapp_slot1_partition: partition@800 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x800 DT_SIZE_K(330)>;
 			};
 
 			cpurad_slot1_partition: partition@53000 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x53000 DT_SIZE_K(220)>;
 			};
 
@@ -72,10 +76,12 @@
 		};
 
 		storage_partition: partition@1c8000 {
+			compatible = "zephyr,mapped-partition";
 			reg = <0x1c8000 DT_SIZE_K(40)>;
 		};
 
 		periphconf_partition: partition@1d2000 {
+			compatible = "zephyr,mapped-partition";
 			reg = <0x1d2000 DT_SIZE_K(8)>;
 		};
 
@@ -85,25 +91,29 @@
 		 * there is no more space after secure_storage_partition.
 		 */
 		secure_storage_partition: partition@1fd000 {
-			compatible = "fixed-subpartitions";
+			compatible = "zephyr,mapped-partition";
 			reg = <0x1fd000 DT_SIZE_K(12)>;
 			ranges = <0x0 0x1fd000 DT_SIZE_K(12)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 
 			cpuapp_crypto_partition: partition@0 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x0 DT_SIZE_K(4)>;
 			};
 
 			cpurad_crypto_partition: partition@1000 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x1000 DT_SIZE_K(4)>;
 			};
 
 			cpuapp_its_partition: partition@2000 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x2000 DT_SIZE_K(2)>;
 			};
 
 			cpurad_its_partition: partition@2800 {
+				compatible = "zephyr,mapped-partition";
 				reg = <0x2800 DT_SIZE_K(2)>;
 			};
 		};

applications/nrf_desktop/src/modules/dfu.c

@@ -130,18 +130,12 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_LOG_LEVEL);
 		#define MCUBOOT_PRIMARY_NODE   DT_NODELABEL(slot0_partition)
 		#define MCUBOOT_SECONDARY_NODE DT_NODELABEL(slot1_partition)
 
-		BUILD_ASSERT(UTIL_OR(DT_PARTITION_EXISTS(MCUBOOT_PRIMARY_NODE),
-			     DT_FIXED_SUBPARTITION_EXISTS(MCUBOOT_PRIMARY_NODE)),
+		BUILD_ASSERT(DT_PARTITION_EXISTS(MCUBOOT_PRIMARY_NODE),
 			     "Missing primary partition definition in DTS.");
-		BUILD_ASSERT(UTIL_OR(DT_PARTITION_EXISTS(MCUBOOT_SECONDARY_NODE),
-			     DT_FIXED_SUBPARTITION_EXISTS(MCUBOOT_SECONDARY_NODE)),
+		BUILD_ASSERT(DT_PARTITION_EXISTS(MCUBOOT_SECONDARY_NODE),
 			     "Missing secondary partition definition in DTS.");
 
-
-		#define NVM_ADDRESS(node) \
-			(COND_CODE_1(DT_FIXED_SUBPARTITION_EXISTS(node), \
-				(DT_FIXED_SUBPARTITION_ADDR(node)), \
-				(DT_PARTITION_ADDR(node))))
+		#define NVM_ADDRESS(node) DT_PARTITION_ADDR(node)
 		#define CODE_PARTITION_START_ADDR    NVM_ADDRESS(CODE_PARTITION_NODE)
 		#define MCUBOOT_PRIMARY_START_ADDR   NVM_ADDRESS(MCUBOOT_PRIMARY_NODE)
 		#define MCUBOOT_SECONDARY_START_ADDR NVM_ADDRESS(MCUBOOT_SECONDARY_NODE)