All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthias Klein <matthias.klein@optimeas.de>
To: tony@atomide.com, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, support@phytec.de
Cc: matthias.klein@optimeas.de
Subject: [PATCH] ARM: dts: am335x-phycore-som: Move NAND partition table into board files
Date: Fri,  7 Aug 2015 11:09:59 +0200	[thread overview]
Message-ID: <1438938599-11252-1-git-send-email-matthias.klein@optimeas.de> (raw)

Partitions which are defined in the som file can not be deleted in the
board file.

Signed-off-by: Matthias Klein <matthias.klein@optimeas.de>
---
 arch/arm/boot/dts/am335x-phycore-som.dtsi | 37 -------------------------
 arch/arm/boot/dts/am335x-wega.dtsi        | 45 +++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 4d28fc3..8f12bd54 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -189,43 +189,6 @@
 
 		#address-cells = <1>;
 		#size-cells = <1>;
-
-		partition@0 {
-			label = "xload";
-			reg = <0x0 0x20000>;
-		};
-		partition@1 {
-			label = "xload_backup1";
-			reg = <0x20000 0x20000>;
-		};
-		partition@2 {
-			label = "xload_backup2";
-			reg = <0x40000 0x20000>;
-		};
-		partition@3 {
-			label = "xload_backup3";
-			reg = <0x60000 0x20000>;
-		};
-		partition@4 {
-			label = "barebox";
-			reg = <0x80000 0x80000>;
-		};
-		partition@5 {
-			label = "bareboxenv";
-			reg = <0x100000 0x40000>;
-		};
-		partition@6 {
-			label = "oftree";
-			reg = <0x140000 0x40000>;
-		};
-		partition@7 {
-			label = "kernel";
-			reg = <0x180000 0x800000>;
-		};
-		partition@8 {
-			label = "root";
-			reg = <0x980000 0x0>;
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
index 5e541bd..945a41d 100644
--- a/arch/arm/boot/dts/am335x-wega.dtsi
+++ b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -149,3 +149,48 @@
 &usb1_phy {
 	status = "okay";
 };
+
+&nandflash {
+	partition@0 {
+		label = "xload";
+		reg = <0x0 0x20000>;
+	};
+
+	partition@1 {
+		label = "xload_backup1";
+		reg = <0x20000 0x20000>;
+	};
+
+	partition@2 {
+		label = "xload_backup2";
+		reg = <0x40000 0x20000>;
+	};
+
+	partition@3 {
+		label = "xload_backup3";
+		reg = <0x60000 0x20000>;
+	};
+
+	partition@4 {
+		label = "barebox";
+		reg = <0x80000 0x80000>;
+	};
+
+	partition@5 {
+		label = "bareboxenv";
+		reg = <0x100000 0x40000>;
+	};
+
+	partition@6 {
+		label = "oftree";
+		reg = <0x140000 0x40000>;
+	};
+	partition@7 {
+		label = "kernel";
+		reg = <0x180000 0x800000>;
+	};
+	partition@8 {
+		label = "root";
+		reg = <0x980000 0x0>;
+	};
+};
-- 
2.1.4


WARNING: multiple messages have this Message-ID (diff)
From: matthias.klein@optimeas.de (Matthias Klein)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: dts: am335x-phycore-som: Move NAND partition table into board files
Date: Fri,  7 Aug 2015 11:09:59 +0200	[thread overview]
Message-ID: <1438938599-11252-1-git-send-email-matthias.klein@optimeas.de> (raw)

Partitions which are defined in the som file can not be deleted in the
board file.

Signed-off-by: Matthias Klein <matthias.klein@optimeas.de>
---
 arch/arm/boot/dts/am335x-phycore-som.dtsi | 37 -------------------------
 arch/arm/boot/dts/am335x-wega.dtsi        | 45 +++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 4d28fc3..8f12bd54 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -189,43 +189,6 @@
 
 		#address-cells = <1>;
 		#size-cells = <1>;
-
-		partition at 0 {
-			label = "xload";
-			reg = <0x0 0x20000>;
-		};
-		partition at 1 {
-			label = "xload_backup1";
-			reg = <0x20000 0x20000>;
-		};
-		partition at 2 {
-			label = "xload_backup2";
-			reg = <0x40000 0x20000>;
-		};
-		partition at 3 {
-			label = "xload_backup3";
-			reg = <0x60000 0x20000>;
-		};
-		partition at 4 {
-			label = "barebox";
-			reg = <0x80000 0x80000>;
-		};
-		partition at 5 {
-			label = "bareboxenv";
-			reg = <0x100000 0x40000>;
-		};
-		partition at 6 {
-			label = "oftree";
-			reg = <0x140000 0x40000>;
-		};
-		partition at 7 {
-			label = "kernel";
-			reg = <0x180000 0x800000>;
-		};
-		partition at 8 {
-			label = "root";
-			reg = <0x980000 0x0>;
-		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi
index 5e541bd..945a41d 100644
--- a/arch/arm/boot/dts/am335x-wega.dtsi
+++ b/arch/arm/boot/dts/am335x-wega.dtsi
@@ -149,3 +149,48 @@
 &usb1_phy {
 	status = "okay";
 };
+
+&nandflash {
+	partition at 0 {
+		label = "xload";
+		reg = <0x0 0x20000>;
+	};
+
+	partition at 1 {
+		label = "xload_backup1";
+		reg = <0x20000 0x20000>;
+	};
+
+	partition at 2 {
+		label = "xload_backup2";
+		reg = <0x40000 0x20000>;
+	};
+
+	partition at 3 {
+		label = "xload_backup3";
+		reg = <0x60000 0x20000>;
+	};
+
+	partition at 4 {
+		label = "barebox";
+		reg = <0x80000 0x80000>;
+	};
+
+	partition at 5 {
+		label = "bareboxenv";
+		reg = <0x100000 0x40000>;
+	};
+
+	partition at 6 {
+		label = "oftree";
+		reg = <0x140000 0x40000>;
+	};
+	partition at 7 {
+		label = "kernel";
+		reg = <0x180000 0x800000>;
+	};
+	partition at 8 {
+		label = "root";
+		reg = <0x980000 0x0>;
+	};
+};
-- 
2.1.4

             reply	other threads:[~2015-08-07  9:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-07  9:09 Matthias Klein [this message]
2015-08-07  9:09 ` [PATCH] ARM: dts: am335x-phycore-som: Move NAND partition table into board files Matthias Klein
2015-08-11 10:04 ` Teresa Remmet
2015-08-11 10:04   ` Teresa Remmet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438938599-11252-1-git-send-email-matthias.klein@optimeas.de \
    --to=matthias.klein@optimeas.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=support@phytec.de \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.