random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pali Rohár 2022-08-03 13:00:51 +02:00 committed by Stefan Roese
parent 8879258ec0
commit 5d4d1212f7
25 changed files with 8 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/dts/armada-370-xp.dtsi
View File

@ -102,7 +102,6 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>; ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
u-boot,dm-pre-reloc;
rtc: rtc@10300 { rtc: rtc@10300 {
compatible = "marvell,orion-rtc"; compatible = "marvell,orion-rtc";

3
arch/arm/dts/armada-375-db.dts
View File

@ -86,10 +86,8 @@
* by default. * by default.
*/ */
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
spi-flash@0 { spi-flash@0 {
u-boot,dm-pre-reloc;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "n25q128a13", "jedec,spi-nor"; compatible = "n25q128a13", "jedec,spi-nor";
@ -113,7 +111,6 @@
}; };
serial@12000 { serial@12000 {
u-boot,dm-pre-reloc;
status = "okay"; status = "okay";
}; };

2
arch/arm/dts/armada-375.dtsi
View File

@ -103,7 +103,6 @@
soc { soc {
compatible = "marvell,armada375-mbus", "simple-bus"; compatible = "marvell,armada375-mbus", "simple-bus";
u-boot,dm-pre-reloc;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
controller = <&mbusc>; controller = <&mbusc>;
@ -168,7 +167,6 @@
internal-regs { internal-regs {
compatible = "simple-bus"; compatible = "simple-bus";
u-boot,dm-pre-reloc;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>; ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;

14
arch/arm/dts/armada-385-atl-x530-u-boot.dtsi
View File

@ -1,17 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // 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 { &watchdog {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
#include "mvebu-u-boot.dtsi"

3
arch/arm/dts/armada-385-db-88f6820-amc.dts
View File

@ -53,7 +53,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins>; pinctrl-0 = <&uart0_pins>;
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
@ -114,10 +113,8 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_pins>; pinctrl-0 = <&spi1_pins>;
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
spi-flash@0 { spi-flash@0 {
u-boot,dm-pre-reloc;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";

8
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi
View File

@ -37,11 +37,7 @@
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
&spi0 { &spi0 {
u-boot,dm-pre-reloc;
flash@0 { flash@0 {
u-boot,dm-pre-reloc;
partitions { partitions {
partition@0 { partition@0 {
reg = <0x0 CONFIG_ENV_OFFSET>; reg = <0x0 CONFIG_ENV_OFFSET>;
@ -56,6 +52,4 @@
}; };
#endif #endif
&uart0 { #include "mvebu-u-boot.dtsi"
u-boot,dm-pre-reloc;
};

2
arch/arm/dts/armada-388-clearfog-u-boot.dtsi
View File

@ -35,3 +35,5 @@
u-boot,dm-spl; u-boot,dm-spl;
}; };
}; };
#include "mvebu-u-boot.dtsi"

3
arch/arm/dts/armada-388-gp.dts
View File

@ -71,12 +71,10 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_pins>; pinctrl-0 = <&spi0_pins>;
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
spi-flash@0 { spi-flash@0 {
u-boot,dm-pre-reloc;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "st,m25p128", "jedec,spi-nor"; compatible = "st,m25p128", "jedec,spi-nor";
@ -132,7 +130,6 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins>; pinctrl-0 = <&uart0_pins>;
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
/* GE1 CON15 */ /* GE1 CON15 */

2
arch/arm/dts/armada-388-helios4-u-boot.dtsi
View File

@ -42,3 +42,5 @@
u-boot,dm-spl; u-boot,dm-spl;
}; };
}; };
#include "mvebu-u-boot.dtsi"

4
arch/arm/dts/armada-38x-controlcenterdc.dts
View File

@ -24,10 +24,6 @@
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
&uart0 {
u-boot,dm-pre-reloc;
};
&uart1 { &uart1 {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };

1
arch/arm/dts/armada-38x-solidrun-microsom.dtsi
View File

@ -96,7 +96,6 @@
pinctrl-0 = <&uart0_pins>; pinctrl-0 = <&uart0_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
&i2c0 { &i2c0 {

2
arch/arm/dts/armada-38x.dtsi
View File

@ -35,7 +35,6 @@
soc { soc {
compatible = "marvell,armada380-mbus", "simple-bus"; compatible = "marvell,armada380-mbus", "simple-bus";
u-boot,dm-pre-reloc;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
controller = <&mbusc>; controller = <&mbusc>;
@ -100,7 +99,6 @@
internal-regs { internal-regs {
compatible = "simple-bus"; compatible = "simple-bus";
u-boot,dm-pre-reloc;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>; ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;

13
arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi
View File

@ -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;
};
};

1
arch/arm/dts/armada-xp-crs305-1g-4s.dtsi
View File

@ -19,7 +19,6 @@
/dts-v1/; /dts-v1/;
#include "armada-xp-98dx3236.dtsi" #include "armada-xp-98dx3236.dtsi"
#include "armada-xp-crs305-1g-4s-u-boot.dtsi"
/ { / {
model = "CRS305-1G-4S+"; model = "CRS305-1G-4S+";

13
arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi
View File

@ -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;
};
};

1
arch/arm/dts/armada-xp-crs326-24g-2s.dtsi
View File

@ -19,7 +19,6 @@
/dts-v1/; /dts-v1/;
#include "armada-xp-98dx3236.dtsi" #include "armada-xp-98dx3236.dtsi"
#include "armada-xp-crs326-24g-2s-u-boot.dtsi"
/ { / {
model = "CRS326-24G-2S+"; model = "CRS326-24G-2S+";

13
arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi
View File

@ -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;
};
};

1
arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi
View File

@ -19,7 +19,6 @@
/dts-v1/; /dts-v1/;
#include "armada-xp-98dx3236.dtsi" #include "armada-xp-98dx3236.dtsi"
#include "armada-xp-crs328-4c-20s-4s-u-boot.dtsi"
/ { / {
model = "CRS328-4C-20S-4S+"; model = "CRS328-4C-20S-4S+";

12
arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi
View File

@ -1,9 +1,5 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
&uart0 {
u-boot,dm-pre-reloc;
};
&nand_controller { &nand_controller {
compatible="marvell,armada370-nand-controller"; compatible="marvell,armada370-nand-controller";
status = "okay"; status = "okay";
@ -15,10 +11,4 @@
nand-ecc-step-size = <512>; nand-ecc-step-size = <512>;
}; };
&spi0 { #include "mvebu-u-boot.dtsi"
u-boot,dm-pre-reloc;
spi-flash@0 {
u-boot,dm-pre-reloc;
};
};

19
arch/arm/dts/armada-xp-gp-u-boot.dtsi
View File

@ -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;
};
};

1
arch/arm/dts/armada-xp-maxbcm.dts
View File

@ -151,7 +151,6 @@
internal-regs { internal-regs {
serial@12000 { serial@12000 {
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
serial@12100 { serial@12100 {
status = "okay"; status = "okay";

9
arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
View File

@ -1,9 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
&spi0 {
u-boot,dm-pre-reloc;
spi-flash@0 {
u-boot,dm-pre-reloc;
};
};

1
arch/arm/dts/armada-xp-synology-ds414.dts
View File

@ -78,7 +78,6 @@
*/ */
serial@12000 { serial@12000 {
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
/* Connected to a Microchip PIC16F883 for power control */ /* Connected to a Microchip PIC16F883 for power control */

3
arch/arm/dts/armada-xp-theadorable.dts
View File

@ -88,7 +88,6 @@
internal-regs { internal-regs {
serial@12000 { serial@12000 {
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
}; };
serial@12100 { serial@12100 {
@ -170,10 +169,8 @@
&spi0 { &spi0 {
status = "okay"; status = "okay";
u-boot,dm-pre-reloc;
spi-flash@0 { spi-flash@0 {
u-boot,dm-pre-reloc;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "n25q128a13", "jedec,spi-nor"; compatible = "n25q128a13", "jedec,spi-nor";

1
arch/arm/dts/armada-xp.dtsi
View File

@ -29,7 +29,6 @@
soc { soc {
compatible = "marvell,armadaxp-mbus", "simple-bus"; compatible = "marvell,armadaxp-mbus", "simple-bus";
u-boot,dm-pre-reloc;
bootrom { bootrom {
compatible = "marvell,bootrom"; compatible = "marvell,bootrom";