[PATCH] ARM: phytec-som-am335x: Remove kernel and oftree partiton in NAND

[Teresa Remmet]

We store kernel and oftree in static UBI volumes now. No need
for seperate partitions any more.

Signed-off-by: Teresa Remmet <t.remmet at phytec.de>
---
 .../phytec-som-am335x/defaultenv-physom-am335x/boot/nand     |  6 ++++--
 arch/arm/dts/am335x-phytec-phycard-som.dtsi                  | 12 +-----------
 arch/arm/dts/am335x-phytec-phycore-som.dtsi                  | 12 +-----------
 arch/arm/dts/am335x-phytec-phyflex-som.dtsi                  | 12 +-----------
 4 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand
index b9b1bc6..ece44b7 100644
--- a/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand
+++ b/arch/arm/boards/phytec-som-am335x/defaultenv-physom-am335x/boot/nand
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-global.bootm.image="/dev/nand0.kernel.bb"
-global.bootm.oftree="/dev/nand0.oftree.bb"
+[ ! -e /dev/nand0.root.ubi ] && ubiattach /dev/nand0.root
+
+global.bootm.image="/dev/nand0.root.ubi.kernel"
+global.bootm.oftree="/dev/nand0.root.ubi.oftree"
 
 global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rw rootfstype=ubifs"
diff --git a/arch/arm/dts/am335x-phytec-phycard-som.dtsi b/arch/arm/dts/am335x-phytec-phycard-som.dtsi
index 3dd9cad..d608f63 100644
--- a/arch/arm/dts/am335x-phytec-phycard-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phycard-som.dtsi
@@ -216,22 +216,12 @@
 		};
 
 		partition at 1C0000 {
-			label = "oftree";
-			reg = <0x1C0000 0x40000>;
-		};
-
-		partition at 200000 {
-			label = "kernel";
-			reg = <0x200000 0x800000>;
-		};
-
-		partition at A00000 {
 			label = "root";
 			/*
 			 * Size 0x0 extends partition to
 			 * end of nand flash.
 			 */
-			reg = <0xA00000 0x0>;
+			reg = <0x1C0000 0x0>;
 		};
 	};
 };
diff --git a/arch/arm/dts/am335x-phytec-phycore-som.dtsi b/arch/arm/dts/am335x-phytec-phycore-som.dtsi
index 0fc3c96..0b8c454 100644
--- a/arch/arm/dts/am335x-phytec-phycore-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phycore-som.dtsi
@@ -300,22 +300,12 @@
 		};
 
 		partition at 1C0000 {
-			label = "oftree";
-			reg = <0x1C0000 0x40000>;
-		};
-
-		partition at 200000 {
-			label = "kernel";
-			reg = <0x200000 0x800000>;
-		};
-
-		partition at A00000 {
 			label = "root";
 			/*
 			 * Size 0x0 extends partition to
 			 * end of nand flash.
 			 */
-			reg = <0xA00000 0x0>;
+			reg = <0x1C0000 0x0>;
 		};
 	};
 };
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
index db78cb1..5b8bb5d 100644
--- a/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
+++ b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
@@ -314,22 +314,12 @@
 		};
 
 		partition at 1C0000 {
-			label = "oftree";
-			reg = <0x1C0000 0x40000>;
-		};
-
-		partition at 200000 {
-			label = "kernel";
-			reg = <0x200000 0x800000>;
-		};
-
-		partition at A00000 {
 			label = "root";
 			/*
 			 * Size 0x0 extends partition to
 			 * end of nand flash.
 			 */
-			reg = <0xA00000 0x0>;
+			reg = <0x1C0000 0x0>;
 		};
 	};
 };
-- 
1.9.1