arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all 32-bit Armada SoCs

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@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-370-xp.dtsi b/arch/arm/dts/armada-370-xp.dtsi
index 4cd168c95784556102a92b7bbc3752a962f1c88d..310f159cd5dd3e43a6f1566c3426e51d2f1c0f38 100644 (file)
--- 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@10300 {
                                compatible = "marvell,orion-rtc";

diff --git a/arch/arm/dts/armada-375-db.dts b/arch/arm/dts/armada-375-db.dts
index 343349b8fd6ea2db045b12cbd868e38ccd6d10bd..d778839006490739c27f8f338e6f0b7040969588 100644 (file)
--- 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@0 {
-                                       u-boot,dm-pre-reloc;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
                                        compatible = "n25q128a13", "jedec,spi-nor";
@@ -113,7 +111,6 @@
                        };
 
                        serial@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 fcb9245fd4967fd9cbb3e997ccd4f14268638051..20a8c352b2f13142e627345f6a858b370bb65a69 100644 (file)
--- 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 79b694cb84bce0935936d3a150576e8c9d1083c9..4a3fb2ce408392bb8831a114e36a3f07279c9314 100644 (file)
--- 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@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 59a425f6b15518acc59dfe8ec7a36ee26d1e5ebd..1a2d79d75820e322e2dab08dc47dc2a3d85f34ba 100644 (file)
--- 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@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 ec12298fd40cf5c9f274d96e7aca058a914fac0c..3f1e761a95438638b1b914fe3465418b1e996172 100644 (file)
--- 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@0 {
-               u-boot,dm-pre-reloc;
-
                partitions {
                        partition@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 20f5c8fb8ceff4a73a7d527098fdef5c824294e9..96629294be4bc3fa2428ab1f250a3d7cfb9dbda1 100644 (file)
--- 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 d59aa5f232dc59a1ab1f33886ef3e8bb6a7e9228..f5345fb1aa14c7bcebb43ff5d600b000156d74e9 100644 (file)
--- 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@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 1047c1af2330413ab8e92bedf1dc86bddafb8cea..bac4b060589fad2699e129784d4d76d2df535609 100644 (file)
--- 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 5063a798df76b39bedbad380915befcbe254690c..b5d76f8b22d6ce708b85ec6c457e14c95df0164c 100644 (file)
--- 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 9bbeafc53bfe6ceb3c80254d9336d8cac651064b..f6ae784bed4e7f5cb43b813b1d8ad76753686839 100644 (file)
--- 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 3e970097c89eb7ad0d8cd8aaaa4d7fd21698b890..cf7ac4a90c686dc141ebe29889ea92df101ca888 100644 (file)
--- 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 (file)
index 8576a02..0000000
--- 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@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 1a74ecd5b52e48232e316a91dc82a77a1b45034f..d09cd477424e1348c03c9cd70573925709e7daf5 100644 (file)
--- 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 (file)
index 8576a02..0000000
--- 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@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 e50f3ead13b2bec17138f6d99813359d99f900c8..35b432ffb5feb76deb16cd6ce1eb6cac60ea40e7 100644 (file)
--- 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 (file)
index 8576a02..0000000
--- 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@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 daff1af2a243eec7ece30ea00ebf6d03429f832c..63586b63a8bb7c29cb5fdf1d364db9ba1a7e9c83 100644 (file)
--- 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 fdbe168a8734d849abd360b129b9bbf6637613c8..dc20643bfa37b0725dc777a31ee383e1123f8cbd 100644 (file)
--- 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@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 (file)
index 2422856..0000000
--- 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@12000 {
-                               u-boot,dm-pre-reloc;
-                       };
-               };
-       };
-};
-
-&spi0 {
-       u-boot,dm-pre-reloc;
-
-       spi-flash@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 d2b07f74cf5373bed9d65b224d8d00a2712c61df..b0b04842cc52c62355289e75db0ff783d92b95d5 100644 (file)
--- a/arch/arm/dts/armada-xp-maxbcm.dts
+++ b/arch/arm/dts/armada-xp-maxbcm.dts
@@ -151,7 +151,6 @@
                internal-regs {
                        serial@12000 {
                                status = "okay";
-                               u-boot,dm-pre-reloc;
                        };
                        serial@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 (file)
index 22fae16..0000000
--- 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@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 35909e3c69c6c3098b55ce1422bca5b67537fac7..fdc9b47bdd78bd7da89ac69de77589df66492eef 100644 (file)
--- a/arch/arm/dts/armada-xp-synology-ds414.dts
+++ b/arch/arm/dts/armada-xp-synology-ds414.dts
@@ -78,7 +78,6 @@
                         */
                        serial@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 a06a65af158733d27d32fd4b02593fc379c5391e..2f6aa194cf0f586bba4999580aa1baccc1124dfc 100644 (file)
--- a/arch/arm/dts/armada-xp-theadorable.dts
+++ b/arch/arm/dts/armada-xp-theadorable.dts
@@ -88,7 +88,6 @@
                internal-regs {
                        serial@12000 {
                                status = "okay";
-                               u-boot,dm-pre-reloc;
                        };
 
                        serial@12100 {
@@ -170,10 +169,8 @@
 
 &spi0 {
        status = "okay";
-       u-boot,dm-pre-reloc;
 
        spi-flash@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 fb5640bbd93c75e240b971f999db8483608e9275..3bd72f1739043fbc7d8f99cf2973808b47ff039e 100644 (file)
--- 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";