mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>,
	Roland Hieber <rhi@pengutronix.de>
Subject: [PATCH 04/15] ARM: vexpress: dts: fix barebox partitioning breakage
Date: Thu, 18 Jun 2020 11:10:51 +0200	[thread overview]
Message-ID: <20200618091102.30150-5-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20200618091102.30150-1-a.fatoum@pengutronix.de>

There is no /smb@4000000 node upstream any longer as it was
renamed with the 8d158e1a4091 ("dts: update to v5.7-rc1") sync.

Adjust the barebox device tree accordingly. It's likely that this
resulted in barebox v2020.06.0 state, environment and update breakage on
the vexpress boards.

Cc: Roland Hieber <rhi@pengutronix.de>
Fixes: 8d158e1a4091 ("dts: update to v5.7-rc1")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/dts/vexpress-v2p-ca15.dts | 26 +++++++--------
 arch/arm/dts/vexpress-v2p-ca9.dts  | 51 ++++++++++++++----------------
 2 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/arch/arm/dts/vexpress-v2p-ca15.dts b/arch/arm/dts/vexpress-v2p-ca15.dts
index 211eaccb6238..a4cdc8d1f5f0 100644
--- a/arch/arm/dts/vexpress-v2p-ca15.dts
+++ b/arch/arm/dts/vexpress-v2p-ca15.dts
@@ -5,23 +5,19 @@
 		compatible = "barebox,environment";
 		device-path = &barebox_env;
 	};
+};
 
-	smb@8000000 {
-		motherboard {
-			flash@0,00000000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
+&{/bus@8000000/motherboard/flash@0,00000000} {
+	#address-cells = <1>;
+	#size-cells = <1>;
 
-				partition@0 {
-					label = "barebox";
-					reg = <0x0 0x80000>;
-				};
+	partition@0 {
+		label = "barebox";
+		reg = <0x0 0x80000>;
+	};
 
-				barebox_env: partition@80000 {
-					label = "barebox-environment";
-					reg = <0x80000 0x80000>;
-				};
-			};
-		};
+	barebox_env: partition@80000 {
+		label = "barebox-environment";
+		reg = <0x80000 0x80000>;
 	};
 };
diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
index b13c114f0cb0..cb4afef185b6 100644
--- a/arch/arm/dts/vexpress-v2p-ca9.dts
+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
@@ -10,34 +10,6 @@
 		state = &state;
 	};
 
-	smb@4000000 {
-		motherboard {
-			flash@0,00000000 {
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partitions {
-					compatible = "fixed-partitions";
-
-					partition@0 {
-						label = "barebox";
-						reg = <0x0 0x80000>;
-					};
-
-					barebox_env: partition@80000 {
-						label = "barebox-environment";
-						reg = <0x80000 0x80000>;
-					};
-
-					state_storage: partition@100000 {
-						label = "barebox-state";
-						reg = <0x100000 0x100000>;
-					};
-				};
-			};
-		};
-	};
-
 	/* State: mutable part */
 	state: state {
 		magic = <0x4d433230>;
@@ -92,3 +64,26 @@
 		};
 	};
 };
+
+&{/bus@4000000/motherboard/flash@0,00000000} {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "barebox";
+			reg = <0x0 0x80000>;
+		};
+
+		barebox_env: partition@80000 {
+			label = "barebox-environment";
+			reg = <0x80000 0x80000>;
+		};
+
+		state_storage: partition@100000 {
+			label = "barebox-state";
+			reg = <0x100000 0x100000>;
+		};
+	};
+};
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-06-18  9:11 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-18  9:10 [PATCH 00/15] ARM: dts: fix regressions from not using phandles Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 01/15] ARM: i.MX50: fix renamed node reference Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 02/15] ARM: dts: fix now duplicate memory nodes Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 03/15] ARM: dts: align all applicable memory nodes with spec and convention Ahmad Fatoum
2020-06-18 13:59   ` Sascha Hauer
2020-06-18  9:10 ` Ahmad Fatoum [this message]
2020-06-18  9:10 ` [PATCH 05/15] ARM: at91: dts: extend, don't create anew, pinctrl node Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 06/15] ARM: dts: reference nodes to extend by phandles instead Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 07/15] ARM: i.MX7: warp: drop duplicate memory node Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 08/15] ARM: mvebu: remove reference to non-existant node Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 09/15] ARM: i.MX6UL: dts: remove defunct override of pico-hobbit memory node Ahmad Fatoum
2020-06-18  9:15   ` Michael Grzeschik
2020-06-18  9:10 ` [PATCH 10/15] ARM: layerscape: dts: combine fsl-ls1046a-rdb.dts aliases nodes Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 11/15] ARM: i.MX7: dts: replace commented-out code with status = "disabled" Ahmad Fatoum
2020-06-18  9:10 ` [PATCH 12/15] ARM: i.MX: mx53-qsrb: dts: remove now-superfluous override Ahmad Fatoum
2020-06-18  9:11 ` [PATCH 13/15] ARM: zynqmp: dts: drop now superfluous zynqmp.dtsi Ahmad Fatoum
2020-06-18  9:11 ` [PATCH 14/15] ARM: socfpga: dts: remove unused nodes and phandles Ahmad Fatoum
2020-06-18  9:11 ` [PATCH 15/15] Documentation: devicetree: codify extension of upstream DTS by phandles Ahmad Fatoum

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=20200618091102.30150-5-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=rhi@pengutronix.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox