summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2020-06-18 11:10:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-06-23 09:55:26 +0200
commit70a550c0125ea5c9170129e4826715243ff49db5 (patch)
tree02bc2370eae388f3f7907b0868fcf5e33083a8e2
parent395e7ce8d3276ca0db45f0727fad655dfb5bc9b2 (diff)
downloadbarebox-70a550c0125ea5c9170129e4826715243ff49db5.tar.gz
ARM: vexpress: dts: fix barebox partitioning breakage
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> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/dts/vexpress-v2p-ca15.dts26
-rw-r--r--arch/arm/dts/vexpress-v2p-ca9.dts51
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 211eacc..a4cdc8d 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 b13c114..cb4afef 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>;
+ };
+ };
+};