From 0b92bbeaaacd3992f2d83622eff6bffb0788d219 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <marti.bolivar@linaro.org>
Date: Wed, 12 Jul 2017 09:46:41 -0400
Subject: [PATCH] dts: move frdm_k64f flash partitions from SoC dtsi

Currently, flash partitions used by mcuboot are defined in the
SoC-level dtsi file for NXP K6X. This should be made more granular so
that product owners can choose partition layouts to suit their
needs. To that end, move the partitions into frdm_k64f.dts.

Signed-off-by: Marti Bolivar <marti.bolivar@linaro.org>
---
 dts/arm/frdm_k64f.dts    | 39 +++++++++++++++++++++++++++++++++++++++
 dts/arm/nxp/nxp_k6x.dtsi | 37 -------------------------------------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/dts/arm/frdm_k64f.dts b/dts/arm/frdm_k64f.dts
index 1578fb981e5..48ab588de9b 100644
--- a/dts/arm/frdm_k64f.dts
+++ b/dts/arm/frdm_k64f.dts
@@ -39,3 +39,42 @@
 	current-speed = <115200>;
 };
 #endif
+
+&flash0 {
+	/*
+	 * If chosen's zephyr,code-partition
+	 * is unset, the image will be linked
+	 * into the entire flash device.  If
+	 * it points to an individual
+	 * partition, the code will be linked
+	 * to, and restricted to that
+	 * partition.
+	 */
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		boot_partition: partition@0 {
+			label = "mcuboot";
+			reg = <0x00000000 0x00010000>;
+			read-only;
+		};
+		app_state_partition: partition@10000 {
+			label = "application-state";
+			reg = <0x00010000 0x00010000>;
+		};
+		slot0_partition: partition@20000 {
+			label = "image-0";
+			reg = <0x00020000 0x00060000>;
+		};
+		slot1_partition: partition@80000 {
+			label = "image-1";
+			reg = <0x00080000 0x00060000>;
+		};
+		scratch_partition: partition@e0000 {
+			label = "image-scratch";
+			reg = <0x000e0000 0x00020000>;
+		};
+	};
+};
diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi
index 291f4f7d942..54ba48c10f5 100644
--- a/dts/arm/nxp/nxp_k6x.dtsi
+++ b/dts/arm/nxp/nxp_k6x.dtsi
@@ -65,43 +65,6 @@
 
 			flash0: flash@0 {
 				reg = <0 0x100000>;
-
-				/*
-				 * If chosen's zephyr,code-partition
-				 * is unset, the image will be linked
-				 * into the entire flash device.  If
-				 * it points to an individual
-				 * partition, the code will be linked
-				 * to, and restricted to that
-				 * partition.
-				 */
-				partitions {
-					compatible = "fixed-partitions";
-					#address-cells = <1>;
-					#size-cells = <1>;
-
-					boot_partition: partition@0 {
-						label = "mcuboot";
-						reg = <0x00000000 0x00010000>;
-						read-only;
-					};
-					app_state_partition: partition@10000 {
-						label = "application-state";
-						reg = <0x00010000 0x00010000>;
-					};
-					slot0_partition: partition@20000 {
-						label = "image-0";
-						reg = <0x00020000 0x00060000>;
-					};
-					slot1_partition: partition@80000 {
-						label = "image-1";
-						reg = <0x00080000 0x00060000>;
-					};
-					scratch_partition: partition@e0000 {
-						label = "image-scratch";
-						reg = <0x000e0000 0x00020000>;
-					};
-				};
 			};
 		};