[PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all 32-bit Armada SoCs
Pali Rohár
pali at kernel.org
Wed Aug 3 13:00:51 CEST 2022
Replace it by including of mvebu-u-boot.dtsi file. When board does not use
-u-boot.dtsi then mvebu-u-boot.dtsi is included automatically by makefile
scripts/Makefile.lib.
Signed-off-by: Pali Rohár <pali at kernel.org>
---
arch/arm/dts/armada-370-xp.dtsi | 1 -
arch/arm/dts/armada-375-db.dts | 3 ---
arch/arm/dts/armada-375.dtsi | 2 --
arch/arm/dts/armada-385-atl-x530-u-boot.dtsi | 14 ++------------
arch/arm/dts/armada-385-db-88f6820-amc.dts | 3 ---
.../dts/armada-385-turris-omnia-u-boot.dtsi | 8 +-------
arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 2 ++
arch/arm/dts/armada-388-gp.dts | 3 ---
arch/arm/dts/armada-388-helios4-u-boot.dtsi | 2 ++
arch/arm/dts/armada-38x-controlcenterdc.dts | 4 ----
.../arm/dts/armada-38x-solidrun-microsom.dtsi | 1 -
arch/arm/dts/armada-38x.dtsi | 2 --
.../dts/armada-xp-crs305-1g-4s-u-boot.dtsi | 13 -------------
arch/arm/dts/armada-xp-crs305-1g-4s.dtsi | 1 -
.../dts/armada-xp-crs326-24g-2s-u-boot.dtsi | 13 -------------
arch/arm/dts/armada-xp-crs326-24g-2s.dtsi | 1 -
.../armada-xp-crs328-4c-20s-4s-u-boot.dtsi | 13 -------------
arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi | 1 -
.../dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi | 12 +-----------
arch/arm/dts/armada-xp-gp-u-boot.dtsi | 19 -------------------
arch/arm/dts/armada-xp-maxbcm.dts | 1 -
.../dts/armada-xp-synology-ds414-u-boot.dtsi | 9 ---------
arch/arm/dts/armada-xp-synology-ds414.dts | 1 -
arch/arm/dts/armada-xp-theadorable.dts | 3 ---
arch/arm/dts/armada-xp.dtsi | 1 -
25 files changed, 8 insertions(+), 125 deletions(-)
delete mode 100644 arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi
delete mode 100644 arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi
delete mode 100644 arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi
delete mode 100644 arch/arm/dts/armada-xp-gp-u-boot.dtsi
delete mode 100644 arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
diff --git a/arch/arm/dts/armada-370-xp.dtsi b/arch/arm/dts/armada-370-xp.dtsi
index 4cd168c95784..310f159cd5dd 100644
--- a/arch/arm/dts/armada-370-xp.dtsi
+++ b/arch/arm/dts/armada-370-xp.dtsi
@@ -102,7 +102,6 @@
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
- u-boot,dm-pre-reloc;
rtc: rtc at 10300 {
compatible = "marvell,orion-rtc";
diff --git a/arch/arm/dts/armada-375-db.dts b/arch/arm/dts/armada-375-db.dts
index 343349b8fd6e..d77883900649 100644
--- a/arch/arm/dts/armada-375-db.dts
+++ b/arch/arm/dts/armada-375-db.dts
@@ -86,10 +86,8 @@
* by default.
*/
status = "okay";
- u-boot,dm-pre-reloc;
spi-flash at 0 {
- u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q128a13", "jedec,spi-nor";
@@ -113,7 +111,6 @@
};
serial at 12000 {
- u-boot,dm-pre-reloc;
status = "okay";
};
diff --git a/arch/arm/dts/armada-375.dtsi b/arch/arm/dts/armada-375.dtsi
index fcb9245fd496..20a8c352b2f1 100644
--- a/arch/arm/dts/armada-375.dtsi
+++ b/arch/arm/dts/armada-375.dtsi
@@ -103,7 +103,6 @@
soc {
compatible = "marvell,armada375-mbus", "simple-bus";
- u-boot,dm-pre-reloc;
#address-cells = <2>;
#size-cells = <1>;
controller = <&mbusc>;
@@ -168,7 +167,6 @@
internal-regs {
compatible = "simple-bus";
- u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
diff --git a/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi b/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi
index 79b694cb84bc..4a3fb2ce4083 100644
--- a/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-atl-x530-u-boot.dtsi
@@ -1,17 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
-&spi1 {
- u-boot,dm-pre-reloc;
-
- spi-flash at 0 {
- u-boot,dm-pre-reloc;
- };
-};
-
-&uart0 {
- u-boot,dm-pre-reloc;
-};
-
&watchdog {
u-boot,dm-pre-reloc;
};
+
+#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-385-db-88f6820-amc.dts b/arch/arm/dts/armada-385-db-88f6820-amc.dts
index 59a425f6b155..1a2d79d75820 100644
--- a/arch/arm/dts/armada-385-db-88f6820-amc.dts
+++ b/arch/arm/dts/armada-385-db-88f6820-amc.dts
@@ -53,7 +53,6 @@
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins>;
status = "okay";
- u-boot,dm-pre-reloc;
};
@@ -114,10 +113,8 @@
pinctrl-names = "default";
pinctrl-0 = <&spi1_pins>;
status = "okay";
- u-boot,dm-pre-reloc;
spi-flash at 0 {
- u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
diff --git a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
index ec12298fd40c..3f1e761a9543 100644
--- a/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
+++ b/arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
@@ -37,11 +37,7 @@
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
&spi0 {
- u-boot,dm-pre-reloc;
-
flash at 0 {
- u-boot,dm-pre-reloc;
-
partitions {
partition at 0 {
reg = <0x0 CONFIG_ENV_OFFSET>;
@@ -56,6 +52,4 @@
};
#endif
-&uart0 {
- u-boot,dm-pre-reloc;
-};
+#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi
index 20f5c8fb8cef..96629294be4b 100644
--- a/arch/arm/dts/armada-388-clearfog-u-boot.dtsi
+++ b/arch/arm/dts/armada-388-clearfog-u-boot.dtsi
@@ -35,3 +35,5 @@
u-boot,dm-spl;
};
};
+
+#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-388-gp.dts b/arch/arm/dts/armada-388-gp.dts
index d59aa5f232dc..f5345fb1aa14 100644
--- a/arch/arm/dts/armada-388-gp.dts
+++ b/arch/arm/dts/armada-388-gp.dts
@@ -71,12 +71,10 @@
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>;
status = "okay";
- u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <0>;
spi-flash at 0 {
- u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p128", "jedec,spi-nor";
@@ -132,7 +130,6 @@
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins>;
status = "okay";
- u-boot,dm-pre-reloc;
};
/* GE1 CON15 */
diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
index 1047c1af2330..bac4b060589f 100644
--- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi
+++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi
@@ -42,3 +42,5 @@
u-boot,dm-spl;
};
};
+
+#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
index 5063a798df76..b5d76f8b22d6 100644
--- a/arch/arm/dts/armada-38x-controlcenterdc.dts
+++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
@@ -24,10 +24,6 @@
u-boot,dm-pre-reloc;
};
-&uart0 {
- u-boot,dm-pre-reloc;
-};
-
&uart1 {
u-boot,dm-pre-reloc;
};
diff --git a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
index 9bbeafc53bfe..f6ae784bed4e 100644
--- a/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
+++ b/arch/arm/dts/armada-38x-solidrun-microsom.dtsi
@@ -96,7 +96,6 @@
pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default";
status = "okay";
- u-boot,dm-pre-reloc;
};
&i2c0 {
diff --git a/arch/arm/dts/armada-38x.dtsi b/arch/arm/dts/armada-38x.dtsi
index 3e970097c89e..cf7ac4a90c68 100644
--- a/arch/arm/dts/armada-38x.dtsi
+++ b/arch/arm/dts/armada-38x.dtsi
@@ -35,7 +35,6 @@
soc {
compatible = "marvell,armada380-mbus", "simple-bus";
- u-boot,dm-pre-reloc;
#address-cells = <2>;
#size-cells = <1>;
controller = <&mbusc>;
@@ -100,7 +99,6 @@
internal-regs {
compatible = "simple-bus";
- u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi b/arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi
deleted file mode 100644
index 8576a027300b..000000000000
--- a/arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-&uart0 {
- u-boot,dm-pre-reloc;
-};
-
-&spi0 {
- u-boot,dm-pre-reloc;
-
- spi-flash at 0 {
- u-boot,dm-pre-reloc;
- };
-};
diff --git a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi
index 1a74ecd5b52e..d09cd477424e 100644
--- a/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi
+++ b/arch/arm/dts/armada-xp-crs305-1g-4s.dtsi
@@ -19,7 +19,6 @@
/dts-v1/;
#include "armada-xp-98dx3236.dtsi"
-#include "armada-xp-crs305-1g-4s-u-boot.dtsi"
/ {
model = "CRS305-1G-4S+";
diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi b/arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi
deleted file mode 100644
index 8576a027300b..000000000000
--- a/arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-&uart0 {
- u-boot,dm-pre-reloc;
-};
-
-&spi0 {
- u-boot,dm-pre-reloc;
-
- spi-flash at 0 {
- u-boot,dm-pre-reloc;
- };
-};
diff --git a/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi b/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi
index e50f3ead13b2..35b432ffb5fe 100644
--- a/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi
+++ b/arch/arm/dts/armada-xp-crs326-24g-2s.dtsi
@@ -19,7 +19,6 @@
/dts-v1/;
#include "armada-xp-98dx3236.dtsi"
-#include "armada-xp-crs326-24g-2s-u-boot.dtsi"
/ {
model = "CRS326-24G-2S+";
diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi
deleted file mode 100644
index 8576a027300b..000000000000
--- a/arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-&uart0 {
- u-boot,dm-pre-reloc;
-};
-
-&spi0 {
- u-boot,dm-pre-reloc;
-
- spi-flash at 0 {
- u-boot,dm-pre-reloc;
- };
-};
diff --git a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi
index daff1af2a243..63586b63a8bb 100644
--- a/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi
+++ b/arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi
@@ -19,7 +19,6 @@
/dts-v1/;
#include "armada-xp-98dx3236.dtsi"
-#include "armada-xp-crs328-4c-20s-4s-u-boot.dtsi"
/ {
model = "CRS328-4C-20S-4S+";
diff --git a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
index fdbe168a8734..dc20643bfa37 100644
--- a/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
+++ b/arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
@@ -1,9 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-&uart0 {
- u-boot,dm-pre-reloc;
-};
-
&nand_controller {
compatible="marvell,armada370-nand-controller";
status = "okay";
@@ -15,10 +11,4 @@
nand-ecc-step-size = <512>;
};
-&spi0 {
- u-boot,dm-pre-reloc;
-
- spi-flash at 0 {
- u-boot,dm-pre-reloc;
- };
-};
+#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-xp-gp-u-boot.dtsi b/arch/arm/dts/armada-xp-gp-u-boot.dtsi
deleted file mode 100644
index 2422856616a9..000000000000
--- a/arch/arm/dts/armada-xp-gp-u-boot.dtsi
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-/ {
- soc {
- internal-regs {
- serial at 12000 {
- u-boot,dm-pre-reloc;
- };
- };
- };
-};
-
-&spi0 {
- u-boot,dm-pre-reloc;
-
- spi-flash at 0 {
- u-boot,dm-pre-reloc;
- };
-};
diff --git a/arch/arm/dts/armada-xp-maxbcm.dts b/arch/arm/dts/armada-xp-maxbcm.dts
index d2b07f74cf53..b0b04842cc52 100644
--- a/arch/arm/dts/armada-xp-maxbcm.dts
+++ b/arch/arm/dts/armada-xp-maxbcm.dts
@@ -151,7 +151,6 @@
internal-regs {
serial at 12000 {
status = "okay";
- u-boot,dm-pre-reloc;
};
serial at 12100 {
status = "okay";
diff --git a/arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi b/arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
deleted file mode 100644
index 22fae16c9d01..000000000000
--- a/arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-&spi0 {
- u-boot,dm-pre-reloc;
-
- spi-flash at 0 {
- u-boot,dm-pre-reloc;
- };
-};
diff --git a/arch/arm/dts/armada-xp-synology-ds414.dts b/arch/arm/dts/armada-xp-synology-ds414.dts
index 35909e3c69c6..fdc9b47bdd78 100644
--- a/arch/arm/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/dts/armada-xp-synology-ds414.dts
@@ -78,7 +78,6 @@
*/
serial at 12000 {
status = "okay";
- u-boot,dm-pre-reloc;
};
/* Connected to a Microchip PIC16F883 for power control */
diff --git a/arch/arm/dts/armada-xp-theadorable.dts b/arch/arm/dts/armada-xp-theadorable.dts
index a06a65af1587..2f6aa194cf0f 100644
--- a/arch/arm/dts/armada-xp-theadorable.dts
+++ b/arch/arm/dts/armada-xp-theadorable.dts
@@ -88,7 +88,6 @@
internal-regs {
serial at 12000 {
status = "okay";
- u-boot,dm-pre-reloc;
};
serial at 12100 {
@@ -170,10 +169,8 @@
&spi0 {
status = "okay";
- u-boot,dm-pre-reloc;
spi-flash at 0 {
- u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q128a13", "jedec,spi-nor";
diff --git a/arch/arm/dts/armada-xp.dtsi b/arch/arm/dts/armada-xp.dtsi
index fb5640bbd93c..3bd72f173904 100644
--- a/arch/arm/dts/armada-xp.dtsi
+++ b/arch/arm/dts/armada-xp.dtsi
@@ -29,7 +29,6 @@
soc {
compatible = "marvell,armadaxp-mbus", "simple-bus";
- u-boot,dm-pre-reloc;
bootrom {
compatible = "marvell,bootrom";
--
2.20.1
More information about the U-Boot
mailing list