Bring in mapped partition binding

Kconfig.zephyr

@@ -99,30 +99,37 @@ config USE_DT_CODE_PARTITION
 # Workaround for not being able to have commas in macro arguments
 DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
 DT_CHOSEN_Z_FLASH := zephyr,flash
+DT_COMPAT_Z_MAPPED_PARTITION := zephyr,mapped-partition
 
-config FLASH_CODE_PARTITION_ADDRESS_INVALID
+config FLASH_USES_MAPPED_PARTITION
 	bool
-	default y if XIP && $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) < FLASH_BASE_ADDRESS
+	default $(dt_node_has_compat,$(dt_chosen_path,$(DT_CHOSEN_Z_CODE_PARTITION)),$(DT_COMPAT_Z_MAPPED_PARTITION))
+	depends on USE_DT_CODE_PARTITION
+	help
+	  Temporary Kconfig to indicate if underlying chosen chosen flash partition uses the
+	  zephyr,mapped-partition compatible, this is to allow ease of migration from
+	  fixed-partitions and should not be relied upon outside of the zephyr build system and
+	  will be removed in future.
+
+config FLASH_CODE_PARTITION_USING_FIXED_PARTITIONS
+	bool
+	default y if XIP && \
+		$(dt_chosen_has_compat,$(dt_node_parent,$(dt_chosen_path,$(DT_CHOSEN_Z_CODE_PARTITION))),fixed-partitions) || \
+		$(dt_chosen_has_compat,$(dt_node_parent,$(dt_chosen_path,$(DT_CHOSEN_Z_CODE_PARTITION))),fixed-subpartitions)
 	depends on USE_DT_CODE_PARTITION
 	select DEPRECATED
 	help
-	  If this item is selected, it is likely selected because your board/SoC/base DTS files
-	  are wrong and have a flash memory that does not start at absolute address 0x0 and:
-	    * Do not have a ``ranges <>;`` property in the flash node passing down the address
-	      and size to child nodes
-	    * Do not have a ``ranges;`` property in the partitions node passing down the previous
-	      ranges to child nodes
+	  If this item is selected then it is because your device is using ``fixed-partitions`` or
+	  ``fixed-subpartitions`` for partition layout, this has been replaced with
+	  ``zephyr,mapped-partitions``.
 
 	  Support for this will be removed and required that your files be updated correctly for
 	  a future release, check the Zephyr 4.4 migration notes.
 
 config FLASH_LOAD_OFFSET
 	# Only user-configurable when USE_DT_CODE_PARTITION is disabled
 	hex "Kernel load offset" if !USE_DT_CODE_PARTITION
-	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) \
-		if FLASH_CODE_PARTITION_ADDRESS_INVALID
-	default $(sub_hex, $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)), \
-			   $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_FLASH))) if USE_DT_CODE_PARTITION
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION)) if USE_DT_CODE_PARTITION
 	default 0
 	help
 	  This option specifies the byte offset from the beginning of flash that

boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_common.dtsi

@@ -31,36 +31,31 @@
 };
 
 &flash1 {
-	/*
-	 * For more information, see:
-	 * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
-	 */
 	partitions {
-		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 
-		/* 48K */
 		boot_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
 			reg = <0x00000000 0xc000>;
 		};
 
-		/* 88K */
 		slot0_partition: partition@c000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x0000c000 0x16000>;
 		};
 
-		/* 88K */
 		slot1_partition: partition@22000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-1";
 			reg = <0x00022000 0x16000>;
 		};
 
-		/* 32K */
 		storage_partition: partition@38000 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x00038000 0x8000>;
 		};

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.dts

@@ -20,11 +20,5 @@
 	};
 };
 
-/* FLPR not supported yet, give all SRAM and RRAM to the APP core */
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(192)>;
-	ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
-};
-
 /* Include default memory partition configuration file */
 #include <vendor/nordic/nrf54l10_cpuapp_partition.dtsi>

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuflpr.dts

@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf54l15_cpuflpr.dtsi>
+#include <vendor/nordic/nrf54l15_cpuflpr.dtsi>
 #include "bl54l15_dvk_common.dtsi"
 
 / {
@@ -22,21 +22,14 @@
 	};
 };
 
-&cpuflpr_sram {
-	status = "okay";
-	/* size must be increased due to booting from SRAM */
-	reg = <0x20028000 DT_SIZE_K(96)>;
-	ranges = <0x0 0x20028000 0x18000>;
-};
-
 &cpuflpr_rram {
 	partitions {
-		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 
 		cpuflpr_code_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x0 DT_SIZE_K(96)>;
 		};

boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuflpr.dts

@@ -6,7 +6,7 @@
  */
 
 /dts-v1/;
-#include <nordic/nrf54l15_cpuflpr.dtsi>
+#include <vendor/nordic/nrf54l15_cpuflpr.dtsi>
 #include "bl54l15u_dvk_common.dtsi"
 
 / {
@@ -22,21 +22,14 @@
 	};
 };
 
-&cpuflpr_sram {
-	status = "okay";
-	/* size must be increased due to booting from SRAM */
-	reg = <0x20028000 DT_SIZE_K(96)>;
-	ranges = <0x0 0x20028000 0x18000>;
-};
-
 &cpuflpr_rram {
 	partitions {
-		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 
 		cpuflpr_code_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x0 DT_SIZE_K(96)>;
 		};

boards/holyiot/yj16019/holyiot_yj16019.dts

@@ -6,7 +6,6 @@
 
 /dts-v1/;
 #include <nordic/nrf52832_qfaa.dtsi>
-#include <nordic/nrf52840_partition.dtsi>
 #include "holyiot_yj16019-pinctrl.dtsi"
 #include <zephyr/dt-bindings/input/input-event-codes.h>
 

boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts

@@ -94,13 +94,15 @@
 
 &flash0 {
 	reg = <0x00000000 DT_SIZE_K(1024)>;
+	ranges = <0x0 0x00000000 DT_SIZE_K(1024)>;
 
 	partitions {
-		compatible = "fixed-partitions";
+		ranges;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		storage_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x00000000 DT_SIZE_K(1024)>;
 		};

boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts

@@ -58,12 +58,12 @@
 	ranges = <0x0 0x01000000 DT_SIZE_K(256)>;
 
 	partitions {
-		compatible = "fixed-partitions";
 		#address-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 
 		storage_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x00000000 DT_SIZE_K(256)>;
 		};

boards/nordic/nrf21540dk/nrf21540dk_nrf52840.dts

@@ -273,21 +273,24 @@ fem_spi: &spi3 {
 
 &flash0 {
 	partitions {
-		compatible = "fixed-partitions";
+		ranges;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		boot_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
 			reg = <0x00000000 0x0000c000>;
 		};
 
 		slot0_partition: partition@c000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x0000c000 0x00076000>;
 		};
 
 		slot1_partition: partition@82000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-1";
 			reg = <0x00082000 0x00076000>;
 		};
@@ -302,6 +305,7 @@ fem_spi: &spi3 {
 		 * if enabled.
 		 */
 		storage_partition: partition@f8000 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x000f8000 0x00008000>;
 		};

boards/nordic/nrf51dk/nrf51dk_nrf51822.dts

@@ -160,26 +160,30 @@
 
 &flash0 {
 	partitions {
-		compatible = "fixed-partitions";
+		ranges;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		boot_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
 			reg = <0x00000000 0x8000>;
 		};
 
 		slot0_partition: partition@8000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x00008000 0x1b000>;
 		};
 
 		slot1_partition: partition@23000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-1";
 			reg = <0x00023000 0x1b000>;
 		};
 
 		storage_partition: partition@3e000 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x0003e000 0x00002000>;
 		};

boards/nordic/nrf51dongle/nrf51dongle_nrf51822.dts

@@ -88,26 +88,30 @@
 
 &flash0 {
 	partitions {
-		compatible = "fixed-partitions";
+		ranges;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		boot_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
 			reg = <0x00000000 0x8000>;
 		};
 
 		slot0_partition: partition@8000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x00008000 0x1b000>;
 		};
 
 		slot1_partition: partition@23000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-1";
 			reg = <0x00023000 0x1b000>;
 		};
 
 		storage_partition: partition@3e000 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x0003e000 0x00002000>;
 		};

boards/nordic/nrf52833dk/nrf52833dk_nrf52820.dts

@@ -161,26 +161,30 @@
 
 &flash0 {
 	partitions {
-		compatible = "fixed-partitions";
+		ranges;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		boot_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
 			reg = <0x00000000 0xc000>;
 		};
 
 		slot0_partition: partition@c000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x0000c000 0x17000>;
 		};
 
 		slot1_partition: partition@23000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-1";
 			reg = <0x00023000 0x17000>;
 		};
 
 		storage_partition: partition@3a000 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x0003a000 0x00006000>;
 		};

boards/nordic/nrf52833dk/nrf52833dk_nrf52833.dts

@@ -231,26 +231,30 @@ arduino_spi: &spi3 {
 
 &flash0 {
 	partitions {
-		compatible = "fixed-partitions";
+		ranges;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		boot_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
 			reg = <0x00000000 0xc000>;
 		};
 
 		slot0_partition: partition@c000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x0000c000 0x37000>;
 		};
 
 		slot1_partition: partition@43000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-1";
 			reg = <0x00043000 0x37000>;
 		};
 
 		storage_partition: partition@7a000 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x0007a000 0x00006000>;
 		};

boards/nordic/nrf52840dk/nrf52840dk_nrf52811.dts

@@ -164,26 +164,30 @@
 
 &flash0 {
 	partitions {
-		compatible = "fixed-partitions";
+		ranges;
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		boot_partition: partition@0 {
+			compatible = "zephyr,mapped-partition";
 			label = "mcuboot";
 			reg = <0x00000000 0xc000>;
 		};
 
 		slot0_partition: partition@c000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-0";
 			reg = <0x0000c000 0xe000>;
 		};
 
 		slot1_partition: partition@1a000 {
+			compatible = "zephyr,mapped-partition";
 			label = "image-1";
 			reg = <0x0001a000 0xe000>;
 		};
 
 		storage_partition: partition@28000 {
+			compatible = "zephyr,mapped-partition";
 			label = "storage";
 			reg = <0x00028000 0x00008000>;
 		};