arm: mvebu: Cleanup u-boot,dm-pre-reloc code
cover arm: mvebu: Cleanup u-boot,dm-pre-reloc code
This patch series cleanup u-boot,dm-pre-reloc code in 32-bit mvebu device tree files. All repeated code patterns are moved into the new mvebu-u-boot.dtsi file which is automatically included by U-Boot build process into all mvebu boards. In file mvebu-u-boot.dtsi is also enabled u-boot,dm-pre-reloc for SPI node when SPL is compiled with SPI driver for loading proper U-Boot. This avoids manually defining
&spi0 { u-boot,dm-pre-reloc; };
in every armada soc which store U-Boot in SPI NOR.
I tested this patch series only on Armada 385 Turris Omnia board (both UART and SPI-NOR booting). Please test it on other Armada boards.
CI tests were running at:
https://github.com/u-boot/u-boot/pull/203
But some x86 test failed, which must be irrelevant as this patch series did not touch code outside of arch/arm/.
Pali Rohár (5):
arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs
arm: mvebu: Remove redundant u-boot,dm-pre-reloc from all 32-bit
Armada SoCs
arm: mvebu: armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc to
-u-boot.dtsi
arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc
to -u-boot.dtsi
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 ++ .../armada-38x-controlcenterdc-u-boot.dtsi | 25 +++++++++++++++++++ arch/arm/dts/armada-38x-controlcenterdc.dts | 20 --------------- .../arm/dts/armada-38x-solidrun-microsom.dtsi | 1 - arch/arm/dts/armada-38x.dtsi | 2 -- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ .../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 - .../arm/dts/armada-xp-theadorable-u-boot.dtsi | 5 ++++ arch/arm/dts/armada-xp-theadorable.dts | 4 --- arch/arm/dts/armada-xp.dtsi | 1 - arch/arm/dts/cn9130.dtsi | 3 +++ arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++ 31 files changed, 71 insertions(+), 142 deletions(-) create mode 100644 arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi 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 create mode 100644 arch/arm/dts/armada-xp-theadorable-u-boot.dtsi create mode 100644 arch/arm/dts/mvebu-u-boot.dtsi
Signature · 1 line
2.20.1
PATCH 4/5 arm: mvebu: armada-xp-theadorable.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi
Move U-Boot specific device tree property u-boot,dm-pre-reloc into U-Boot specific device tree include file armada-xp-theadorable-u-boot.dtsi.
--- arch/arm/dts/armada-xp-theadorable-u-boot.dtsi | 5 +++++ arch/arm/dts/armada-xp-theadorable.dts | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
arch/arm/dts/armada-xp-theadorable-u-boot.dtsi new file +5 -0
@@ -0,0 +1,5 @@ +&lcd0 { + u-boot,dm-pre-reloc; +}; + +#include "mvebu-u-boot.dtsi"
arch/arm/dts/armada-xp-theadorable.dts +0 -1
@@ -134,7 +134,6 @@ compatible = "marvell,armada-xp-lcd"; reg = <0xe0000 0x10000>; status = "okay"; - u-boot,dm-pre-reloc; display-timings { native-mode = <&timing0>;
Signature · 1 line
2.20.1
PATCH 1/5 arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
In reply to Pali RohárFor future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)
arch/arm/dts/armada-7040.dtsi +3 -0
@@ -63,3 +63,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};
arch/arm/dts/armada-8040.dtsi +3 -0
@@ -87,3 +87,6 @@ marvell,function = <3>; }; }; + +spi0: &cp1_spi1 { +};
arch/arm/dts/cn9130.dtsi +3 -0
@@ -71,3 +71,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};
Signature · 1 line
2.20.1
PATCH 5/5 arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi
In reply to Pali RohárMove U-Boot specific device tree property u-boot,dm-pre-reloc into U-Boot specific device tree include file armada-38x-controlcenterdc-u-boot.dtsi.
--- .../armada-38x-controlcenterdc-u-boot.dtsi | 25 +++++++++++++++++++ arch/arm/dts/armada-38x-controlcenterdc.dts | 16 ------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi new file +25 -0
@@ -0,0 +1,25 @@ +&gpio0 { + u-boot,dm-pre-reloc; +}; + +&gpio1 { + u-boot,dm-pre-reloc; +}; + +&uart1 { + u-boot,dm-pre-reloc; +}; + +&spi1 { + u-boot,dm-pre-reloc; +}; + +&I2C0 { + u-boot,dm-pre-reloc; +}; + +&PCA22 { + u-boot,dm-pre-reloc; +}; + +#include "mvebu-u-boot.dtsi"
arch/arm/dts/armada-38x-controlcenterdc.dts +0 -16
@@ -16,18 +16,6 @@ #include "armada-388.dtsi" -&gpio0 { - u-boot,dm-pre-reloc; -}; - -&gpio1 { - u-boot,dm-pre-reloc; -}; - -&uart1 { - u-boot,dm-pre-reloc; -}; - / { model = "Controlcenter Digital Compact"; compatible = "marvell,a385-db", "marvell,armada388",
@@ -71,7 +59,6 @@ I2C0: i2c@11000 { status = "okay"; clock-frequency = <1000000>; - u-boot,dm-pre-reloc; PCA21: pca9698@21 { compatible = "nxp,pca9698"; reg = <0x21>;
@@ -80,7 +67,6 @@ }; PCA22: pca9698@22 { compatible = "nxp,pca9698"; - u-boot,dm-pre-reloc; reg = <0x22>; #gpio-cells = <2>; gpio-controller;
@@ -565,7 +551,6 @@ &spi1 { status = "okay"; - u-boot,dm-pre-reloc; spi-flash@0 { #address-cells = <1>; #size-cells = <1>;
@@ -579,6 +564,5 @@ compatible = "n25q128a11", "jedec,spi-nor"; reg = <1>; /* Chip select 1 */ spi-max-frequency = <108000000>; - u-boot,dm-pre-reloc; }; };
Signature · 1 line
2.20.1
PATCH 2/5 arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs
In reply to Pali RohárSet u-boot,dm-pre-reloc for /soc/, /soc/internal-regs/ and &uart0 nodes as it is required on every 32-bit Armada SoCs. And set also u-boot,dm-pre-reloc for &spi0 when going to boot from SPI because otherwise SPL SPI drivers do not load.
--- arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 arch/arm/dts/mvebu-u-boot.dtsi
arch/arm/dts/mvebu-u-boot.dtsi new file +24 -0
@@ -0,0 +1,24 @@ +#include <config.h> + +#ifdef CONFIG_ARMADA_32BIT + +/ { + soc { + u-boot,dm-pre-reloc; + internal-regs { + u-boot,dm-pre-reloc; + }; + }; +}; + +&uart0 { + u-boot,dm-pre-reloc; +}; + +#ifdef CONFIG_SPL_SPI +&spi0 { + u-boot,dm-pre-reloc; +}; +#endif + +#endif
Signature · 1 line
2.20.1
PATCH 3/5 arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all 32-bit Armada SoCs
In reply to Pali RohárReplace 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.
--- 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
arch/arm/dts/armada-370-xp.dtsi +0 -1
@@ -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";
arch/arm/dts/armada-375-db.dts +0 -3
@@ -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"; };
arch/arm/dts/armada-375.dtsi +0 -2
@@ -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>;
arch/arm/dts/armada-385-atl-x530-u-boot.dtsi +2 -12
@@ -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"
arch/arm/dts/armada-385-db-88f6820-amc.dts +0 -3
@@ -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";
arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +1 -7
@@ -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"
arch/arm/dts/armada-388-clearfog-u-boot.dtsi +2 -0
@@ -35,3 +35,5 @@ u-boot,dm-spl; }; }; + +#include "mvebu-u-boot.dtsi"
arch/arm/dts/armada-388-gp.dts +0 -3
@@ -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 */
arch/arm/dts/armada-388-helios4-u-boot.dtsi +2 -0
@@ -42,3 +42,5 @@ u-boot,dm-spl; }; }; + +#include "mvebu-u-boot.dtsi"
arch/arm/dts/armada-38x-controlcenterdc.dts +0 -4
@@ -24,10 +24,6 @@ u-boot,dm-pre-reloc; }; -&uart0 { - u-boot,dm-pre-reloc; -}; - &uart1 { u-boot,dm-pre-reloc; };
arch/arm/dts/armada-38x-solidrun-microsom.dtsi +0 -1
@@ -96,7 +96,6 @@ pinctrl-0 = <&uart0_pins>; pinctrl-names = "default"; status = "okay"; - u-boot,dm-pre-reloc; }; &i2c0 {
arch/arm/dts/armada-38x.dtsi +0 -2
@@ -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>;
arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi deleted +0 -13
@@ -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; - }; -};
arch/arm/dts/armada-xp-crs305-1g-4s.dtsi +0 -1
@@ -19,7 +19,6 @@ /dts-v1/; #include "armada-xp-98dx3236.dtsi" -#include "armada-xp-crs305-1g-4s-u-boot.dtsi" / { model = "CRS305-1G-4S+";
arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi deleted +0 -13
@@ -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; - }; -};
arch/arm/dts/armada-xp-crs326-24g-2s.dtsi +0 -1
@@ -19,7 +19,6 @@ /dts-v1/; #include "armada-xp-98dx3236.dtsi" -#include "armada-xp-crs326-24g-2s-u-boot.dtsi" / { model = "CRS326-24G-2S+";
arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi deleted +0 -13
@@ -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; - }; -};
arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi +0 -1
@@ -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+";
arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi +1 -11
@@ -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"
arch/arm/dts/armada-xp-gp-u-boot.dtsi deleted +0 -19
@@ -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; - }; -};
arch/arm/dts/armada-xp-maxbcm.dts +0 -1
@@ -151,7 +151,6 @@ internal-regs { serial@12000 { status = "okay"; - u-boot,dm-pre-reloc; }; serial@12100 { status = "okay";
arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi deleted +0 -9
@@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -&spi0 { - u-boot,dm-pre-reloc; - - spi-flash@0 { - u-boot,dm-pre-reloc; - }; -};
arch/arm/dts/armada-xp-synology-ds414.dts +0 -1
@@ -78,7 +78,6 @@ */ serial@12000 { status = "okay"; - u-boot,dm-pre-reloc; }; /* Connected to a Microchip PIC16F883 for power control */
arch/arm/dts/armada-xp-theadorable.dts +0 -3
@@ -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";
arch/arm/dts/armada-xp.dtsi +0 -1
@@ -29,7 +29,6 @@ soc { compatible = "marvell,armadaxp-mbus", "simple-bus"; - u-boot,dm-pre-reloc; bootrom { compatible = "marvell,bootrom";
Signature · 1 line
2.20.1
Hi Pali,
I ran 3 tests: UART booting, SPI NOR booting from SPL, and SPI NOR booting from BootROM (CONFIG_SPL_SPI is not set). All tests work great!
Synology DS116 (Armada 385).
Thanks,
Tony
Quoted 72 lines · Pali Rohár
This patch series cleanup u-boot,dm-pre-reloc code in 32-bit mvebu device tree files. All repeated code patterns are moved into the new
mvebu-u-boot.dtsifile which is automatically included by U-Boot build process into all mvebu boards. In filemvebu-u-boot.dtsiis also enabled u-boot,dm-pre-reloc for SPI node when SPL is compiled with SPI driver for loading proper U-Boot. This avoids manually defining
&spi0 { u-boot,dm-pre-reloc; };
in every armada soc which store U-Boot in SPI NOR.I tested this patch series only on Armada 385 Turris Omnia board (both UART and SPI-NOR booting). Please test it on other Armada boards.
CI tests were running at:
https://github.com/u-boot/u-boot/pull/203
But some x86 test failed, which must be irrelevant as this patch series did not touch code outside ofarch/arm/.Pali Rohár (5):
arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
arm: mvebu: Introducemvebu-u-boot.dtsifor 32-bit Armada SoCs
arm: mvebu: Remove redundant u-boot,dm-pre-reloc from all 32-bit
Armada SoCs
arm: mvebu:armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc to
-u-boot.dtsi
arm: mvebu:armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc
to-u-boot.dtsiarch/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 ++ .../armada-38x-controlcenterdc-u-boot.dtsi | 25 +++++++++++++++++++ arch/arm/dts/armada-38x-controlcenterdc.dts | 20 --------------- .../arm/dts/armada-38x-solidrun-microsom.dtsi | 1 - arch/arm/dts/armada-38x.dtsi | 2 -- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ .../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 - .../arm/dts/armada-xp-theadorable-u-boot.dtsi | 5 ++++ arch/arm/dts/armada-xp-theadorable.dts | 4 --- arch/arm/dts/armada-xp.dtsi | 1 - arch/arm/dts/cn9130.dtsi | 3 +++ arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++ 31 files changed, 71 insertions(+), 142 deletions(-) create mode 100644 arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi 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 create mode 100644 arch/arm/dts/armada-xp-theadorable-u-boot.dtsi create mode 100644 arch/arm/dts/mvebu-u-boot.dtsi--
2.20.1
Re: [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc to -u-boot.dtsi
In reply to Pali RohárQuoted 4 lines · Pali Rohár
Move U-Boot specific device tree property u-boot,dm-pre-reloc into U-Boot specific device tree include file
armada-xp-theadorable-u-boot.dtsi.Signed-off-by Pali Rohár <[email protected]>
Thanks,
Stefan
Quoted 22 lines
--- arch/arm/dts/armada-xp-theadorable-u-boot.dtsi | 5 +++++ arch/arm/dts/armada-xp-theadorable.dts | 1 - 2 files changed, 5 insertions(+), 1 deletion(-)create mode 100644
arch/arm/dts/armada-xp-theadorable-u-boot.dtsiarch/arm/dts/armada-xp-theadorable-u-boot.dtsi new file +5
-0@@ -0,0 +1,5 @@ +&lcd0 { + u-boot,dm-pre-reloc; +}; + +#include "mvebu-u-boot.dtsi"arch/arm/dts/armada-xp-theadorable.dts +0
-0
arch/arm/dts/armada-xp-theadorable.dts line 139
Quoted 7 lines
arch/arm/dts/armada-xp-theadorable.dts +0
-1@@ -134,7 +134,6 @@ compatible = "marvell,armada-xp-lcd"; reg = <0xe0000 0x10000>; status = "okay"; - u-boot,dm-pre-reloc; display-timings { native-mode = <&timing0>;
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
In reply to Pali RohárQuoted 9 lines · Pali Rohár
For future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)
You're changing 64-bit Armada files here, but in the cover letter you mention that this patchset only addresses 32-bit mvebu DT files. So why are you making these changes here?
One more comment below...
arch/arm/dts/armada-7040.dtsi line 68
Quoted 11 lines
arch/arm/dts/armada-7040.dtsi +3
-0@@ -63,3 +63,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};
Why is spi0 aliased now to "cp0_spi1"? In the Kernel DT files I see this:
spi0 = &spi0;
spi1 = &cp0_spi0;
spi2 = &cp0_spi1;
...
spi0: spi@510600 {Thanks,
Stefan
Quoted 16 lines
arch/arm/dts/armada-8040.dtsi +3
-0@@ -87,3 +87,6 @@ marvell,function = <3>; }; }; + +spi0: &cp1_spi1 { +};arch/arm/dts/cn9130.dtsi +0
-0
arch/arm/dts/cn9130.dtsi line 76
Quoted 6 lines
arch/arm/dts/cn9130.dtsi +3
-0@@ -71,3 +71,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 2/5] arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs
In reply to Pali RohárQuoted 6 lines · Pali Rohár
Set u-boot,dm-pre-reloc for /soc/, /soc/internal-regs/ and &uart0 nodes as it is required on every 32-bit Armada SoCs. And set also u-boot,dm-pre-reloc for &spi0 when going to boot from SPI because otherwise SPL SPI drivers do not load.
Signed-off-by Pali Rohár <[email protected]>
Thanks,
Stefan
Quoted 25 lines
--- arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)create mode 100644
arch/arm/dts/mvebu-u-boot.dtsiarch/arm/dts/mvebu-u-boot.dtsi new file +14
-0@@ -0,0 +1,24 @@ +#include <config.h> + +#ifdef CONFIG_ARMADA_32BIT + +/ { + soc { + u-boot,dm-pre-reloc; + internal-regs { + u-boot,dm-pre-reloc; + }; + }; +}; + +&uart0 {
arch/arm/dts/mvebu-u-boot.dtsi line 24
Quoted 10 lines
arch/arm/dts/mvebu-u-boot.dtsi new file +10
-0+ u-boot,dm-pre-reloc; +}; + +#ifdef CONFIG_SPL_SPI +&spi0 { + u-boot,dm-pre-reloc; +}; +#endif + +#endif
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all 32-bit Armada SoCs
In reply to Pali RohárQuoted 32 lines · Pali Rohár
Replace it by including of
mvebu-u-boot.dtsifile. When board does not use-u-boot.dtsithenmvebu-u-boot.dtsiis included automatically by makefilescripts/Makefile.lib.Signed-off-by Pali Rohár <[email protected]>--- 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(-)
Quoted 5 lines
delete mode 100644
arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-gp-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi
Very nice diffstat. :)
Thanks,
Stefan
Quoted 429 lines
arch/arm/dts/armada-370-xp.dtsi +0
-1@@ -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";arch/arm/dts/armada-375-db.dts +0
-3@@ -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"; };arch/arm/dts/armada-375.dtsi +0
-2@@ -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>;arch/arm/dts/armada-385-atl-x530-u-boot.dtsi +2
-12@@ -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"arch/arm/dts/armada-385-db-88f6820-amc.dts +0
-3@@ -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";arch/arm/dts/armada-385-turris-omnia-u-boot.dtsi +1
-7@@ -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"arch/arm/dts/armada-388-clearfog-u-boot.dtsi +2
-0@@ -35,3 +35,5 @@ u-boot,dm-spl; }; }; + +#include "mvebu-u-boot.dtsi"arch/arm/dts/armada-388-gp.dts +0
-3@@ -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 */arch/arm/dts/armada-388-helios4-u-boot.dtsi +2
-0@@ -42,3 +42,5 @@ u-boot,dm-spl; }; }; + +#include "mvebu-u-boot.dtsi"arch/arm/dts/armada-38x-controlcenterdc.dts +0
-4@@ -24,10 +24,6 @@ u-boot,dm-pre-reloc; }; -&uart0 { - u-boot,dm-pre-reloc; -}; - &uart1 { u-boot,dm-pre-reloc; };arch/arm/dts/armada-38x-solidrun-microsom.dtsi +0
-1@@ -96,7 +96,6 @@ pinctrl-0 = <&uart0_pins>; pinctrl-names = "default"; status = "okay"; - u-boot,dm-pre-reloc; }; &i2c0 {arch/arm/dts/armada-38x.dtsi +0
-2@@ -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>;arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsi deleted +0
-13@@ -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; - }; -};arch/arm/dts/armada-xp-crs305-1g-4s.dtsi +0
-1@@ -19,7 +19,6 @@ /dts-v1/; #include "armada-xp-98dx3236.dtsi" -#include "armada-xp-crs305-1g-4s-u-boot.dtsi" / { model = "CRS305-1G-4S+";arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsi deleted +0
-13@@ -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; - }; -};arch/arm/dts/armada-xp-crs326-24g-2s.dtsi +0
-1@@ -19,7 +19,6 @@ /dts-v1/; #include "armada-xp-98dx3236.dtsi" -#include "armada-xp-crs326-24g-2s-u-boot.dtsi" / { model = "CRS326-24G-2S+";arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsi deleted +0
-13@@ -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; - }; -};arch/arm/dts/armada-xp-crs328-4c-20s-4s.dtsi +0
-1@@ -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+";arch/arm/dts/armada-xp-db-xc3-24g4xg-u-boot.dtsi +1
-11@@ -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"arch/arm/dts/armada-xp-gp-u-boot.dtsi deleted +0
-19@@ -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; - }; -};arch/arm/dts/armada-xp-maxbcm.dts +0
-1@@ -151,7 +151,6 @@ internal-regs { serial@12000 { status = "okay"; - u-boot,dm-pre-reloc; }; serial@12100 { status = "okay";arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsi deleted +0
-9@@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -&spi0 { - u-boot,dm-pre-reloc; - - spi-flash@0 { - u-boot,dm-pre-reloc; - }; -};arch/arm/dts/armada-xp-synology-ds414.dts +0
-1@@ -78,7 +78,6 @@ */ serial@12000 { status = "okay"; - u-boot,dm-pre-reloc; }; /* Connected to a Microchip PIC16F883 for power control */arch/arm/dts/armada-xp-theadorable.dts +0
-3@@ -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";arch/arm/dts/armada-xp.dtsi +0
-0
arch/arm/dts/armada-xp.dtsi line 34
Quoted 7 lines
arch/arm/dts/armada-xp.dtsi +0
-1@@ -29,7 +29,6 @@ soc { compatible = "marvell,armadaxp-mbus", "simple-bus"; - u-boot,dm-pre-reloc; bootrom { compatible = "marvell,bootrom";
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc to -u-boot.dtsi
In reply to Pali RohárQuoted 4 lines · Pali Rohár
Move U-Boot specific device tree property u-boot,dm-pre-reloc into U-Boot specific device tree include file
armada-38x-controlcenterdc-u-boot.dtsi.Signed-off-by Pali Rohár <[email protected]>
Thanks,
Stefan
Quoted 85 lines
--- .../armada-38x-controlcenterdc-u-boot.dtsi | 25 +++++++++++++++++++ arch/arm/dts/armada-38x-controlcenterdc.dts | 16 ------------ 2 files changed, 25 insertions(+), 16 deletions(-)create mode 100644
arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsiarch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi new file +25
-0@@ -0,0 +1,25 @@ +&gpio0 { + u-boot,dm-pre-reloc; +}; + +&gpio1 { + u-boot,dm-pre-reloc; +}; + +&uart1 { + u-boot,dm-pre-reloc; +}; + +&spi1 { + u-boot,dm-pre-reloc; +}; + +&I2C0 { + u-boot,dm-pre-reloc; +}; + +&PCA22 { + u-boot,dm-pre-reloc; +}; + +#include "mvebu-u-boot.dtsi"arch/arm/dts/armada-38x-controlcenterdc.dts +0
-15@@ -16,18 +16,6 @@ #include "armada-388.dtsi" -&gpio0 { - u-boot,dm-pre-reloc; -}; - -&gpio1 { - u-boot,dm-pre-reloc; -}; - -&uart1 { - u-boot,dm-pre-reloc; -}; - / { model = "Controlcenter Digital Compact"; compatible = "marvell,a385-db", "marvell,armada388",@@ -71,7 +59,6 @@ I2C0: i2c@11000 { status = "okay"; clock-frequency = <1000000>; - u-boot,dm-pre-reloc; PCA21: pca9698@21 { compatible = "nxp,pca9698"; reg = <0x21>;@@ -80,7 +67,6 @@ }; PCA22: pca9698@22 { compatible = "nxp,pca9698"; - u-boot,dm-pre-reloc; reg = <0x22>; #gpio-cells = <2>; gpio-controller;@@ -565,7 +551,6 @@ &spi1 { status = "okay"; - u-boot,dm-pre-reloc; spi-flash@0 { #address-cells = <1>; #size-cells = <1>;
arch/arm/dts/armada-38x-controlcenterdc.dts line 568
Quoted 6 lines
arch/arm/dts/armada-38x-controlcenterdc.dts +0
-1@@ -579,6 +564,5 @@ compatible = "n25q128a11", "jedec,spi-nor"; reg = <1>; /* Chip select 1 */ spi-max-frequency = <108000000>; - u-boot,dm-pre-reloc; }; };
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
In reply to Stefan RoeseQuoted 11 lines · On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
Quoted 9 lines · Pali Rohár
For future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)
Quoted 3 lines
You're changing 64-bit Armada files here, but in the cover letter you mention that this patchset only addresses 32-bit mvebu DT files. So why are you making these changes here?
The main issue is that 64-bit Armada DTS files are compiled also during 32-bit Armada builds. And 32-bit Armada DTS files needs spi0 reference because it is used in 32-bit Armada section in mvebu-u-boot.dtsi file.
I know it is broken build system if during compilation of 32-bit SoC are compiled also unrelated 64-bit Armada DTS files in 32-bit mode. But I do not see currently easier solution than just define "harmless" reference.
During 64-bit Armada builds is content of mvebu-u-boot.dtsi skipped as there is a 32-bit guard.
Proper way, of course, would be to fix build system, so none 64-bit file is compiled (and let unused) during 32-bit build.
Quoted 15 lines
One more comment below...
arch/arm/dts/armada-7040.dtsi line 68
Quoted 11 lines
arch/arm/dts/armada-7040.dtsi +3
-0@@ -63,3 +63,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};Why is spi0 aliased now to "
cp0_spi1"?
Because cp0_spi1 is used in U-Boot 64-bit Armada DTS files as "spi0" alias. Really.
Quoted 8 lines
In the Kernel DT files I see
this:spi0 = &spi0; spi1 = &cp0_spi0; spi2 = &cp0_spi1; ... spi0: spi@510600 {
And you bring another issue :-) U-Boot DTS files for 64-bit Armada SoCs (expects 3720) differs from kernel DTS files. They are incompatible and nobody fixed this issue yet. I fixed it only for 64-bit Armada 3720 as we are using and maintaining Armada 3720 boards.
So I just do not know what to do with remaining 64-bit A7040/A8040/CN9030 SoCs. I just added simple harmless change which do not change behavior nor output of those boards.
Either somebody has to start working on fixing U-Boot support and DTS files for those boards to be compatible with Linux kernel. Or those SoCs stays incompatible with Linux and their technical debt in U-Boot code just grow. Or you as maintainer can decide that they are unmaintained (and ready for removal?).
I'm just not going to do this big cleanup for A7040/A8040/CN9030 SoCs too.
Quoted 33 lines
Thanks,
StefanQuoted 16 lines
arch/arm/dts/armada-8040.dtsi +3
-0@@ -87,3 +87,6 @@ marvell,function = <3>; }; }; + +spi0: &cp1_spi1 { +};arch/arm/dts/cn9130.dtsi +0
-0arch/arm/dts/cn9130.dtsi line 76
Quoted 6 lines
arch/arm/dts/cn9130.dtsi +3
-0@@ -71,3 +71,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};Viele Grüße,
Stefan RoeseSignature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
Quoted 24 lines · Pali Rohár
Quoted 11 lines · On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
Quoted 9 lines · Pali Rohár
For future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)Quoted 3 lines
You're changing 64-bit Armada files here, but in the cover letter you mention that this patchset only addresses 32-bit mvebu DT files. So why are you making these changes here?
The main issue is that 64-bit Armada DTS files are compiled also during 32-bit Armada builds. And 32-bit Armada DTS files needs spi0 reference because it is used in 32-bit Armada section in
mvebu-u-boot.dtsifile.I know it is broken build system if during compilation of 32-bit SoC are compiled also unrelated 64-bit Armada DTS files in 32-bit mode. But I do not see currently easier solution than just define "harmless" reference.
Quoted 5 lines
During 64-bit Armada builds is content of
mvebu-u-boot.dtsiskipped as there is a 32-bit guard.Proper way, of course, would be to fix build system, so none 64-bit file is compiled (and let unused) during 32-bit build.
I see. Thanks for the explanation.
Quoted 28 lines
Quoted 15 lines
One more comment below...
arch/arm/dts/armada-7040.dtsi line 68
Quoted 11 lines
arch/arm/dts/armada-7040.dtsi +3
-0@@ -63,3 +63,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};Why is spi0 aliased now to "
cp0_spi1"?Because
cp0_spi1is used in U-Boot 64-bit Armada DTS files as "spi0" alias. Really.Quoted 8 lines
In the Kernel DT files I see
this:spi0 = &spi0; spi1 = &cp0_spi0; spi2 = &cp0_spi1; ... spi0: spi@510600 {
Quoted 4 lines
And you bring another issue :-) U-Boot DTS files for 64-bit Armada SoCs (expects 3720) differs from kernel DTS files. They are incompatible and nobody fixed this issue yet. I fixed it only for 64-bit Armada 3720 as we are using and maintaining Armada 3720 boards.
Yes, I am aware of this.
Quoted 11 lines
So I just do not know what to do with remaining 64-bit A7040/A8040/CN9030 SoCs. I just added simple harmless change which do not change behavior nor output of those boards.
Either somebody has to start working on fixing U-Boot support and DTS files for those boards to be compatible with Linux kernel. Or those SoCs stays incompatible with Linux and their technical debt in U-Boot code just grow. Or you as maintainer can decide that they are unmaintained (and ready for removal?).
I'm just not going to do this big cleanup for A7040/A8040/CN9030 SoCs too.
Understood. Let's keep the situation in this unfortunate state a while longer. Hopefully someone will find the time to work on this. If nothing changes in a longer period we should think again about this.
Thanks,
Stefan
Quoted 29 lines
Quoted 29 lines
Thanks,
StefanQuoted 16 lines
arch/arm/dts/armada-8040.dtsi +3
-0@@ -87,3 +87,6 @@ marvell,function = <3>; }; }; + +spi0: &cp1_spi1 { +};arch/arm/dts/cn9130.dtsi +0
-0arch/arm/dts/cn9130.dtsi line 76
Quoted 6 lines
arch/arm/dts/cn9130.dtsi +3
-0@@ -71,3 +71,6 @@ marvell,function = <3>; }; }; + +spi0: &cp0_spi1 { +};Viele Grüße,
Stefan Roese
Quoted 4 lines
Quoted 4 lines
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
Quoted 25 lines · On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
Quoted 24 lines · Pali Rohár
Quoted 11 lines · On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
Quoted 9 lines · Pali Rohár
For future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)Quoted 3 lines
You're changing 64-bit Armada files here, but in the cover letter you mention that this patchset only addresses 32-bit mvebu DT files. So why are you making these changes here?
The main issue is that 64-bit Armada DTS files are compiled also during 32-bit Armada builds. And 32-bit Armada DTS files needs spi0 reference because it is used in 32-bit Armada section in
mvebu-u-boot.dtsifile.I know it is broken build system if during compilation of 32-bit SoC are compiled also unrelated 64-bit Armada DTS files in 32-bit mode. But I do not see currently easier solution than just define "harmless" reference.
Quoted 7 lines
Quoted 5 lines
During 64-bit Armada builds is content of
mvebu-u-boot.dtsiskipped as there is a 32-bit guard.Proper way, of course, would be to fix build system, so none 64-bit file is compiled (and let unused) during 32-bit build.
I see. Thanks for the explanation.
I played a bit with build system and have there alternative patch instead of patch 1/5 which "fixes" makefile build system.
From 78ebf95fdf4223ce62cc537a57739ba3adbf556f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
Date: Fri, 5 Aug 2022 12:45:19 +0200
Subject: [PATCH] arm: mvebu: dts: Build only arch-compatible dts files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
64-bit Armada DTS files are not build correctly during compilation of 32-bit Armada boards and vice versa. So fix makefile build system to compile only those dts files which are compatible for the current build (64-bit Armada DTS files only for 64-bit builds and 32-bit Armada DTS files only for 32-bit builds).
--- arch/arm/dts/Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
arch/arm/dts/Makefile +16 -12
@@ -232,12 +232,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra210-p2571.dtb \ tegra210-p3450-0000.dtb +ifdef CONFIG_ARMADA_32BIT dtb-$(CONFIG_ARCH_MVEBU) += \ - armada-3720-db.dtb \ - armada-3720-espressobin.dtb \ - armada-3720-turris-mox.dtb \ - armada-3720-eDPU.dtb \ - armada-3720-uDPU.dtb \ armada-375-db.dtb \ armada-385-atl-x530.dtb \ armada-385-atl-x530DP.dtb \
@@ -247,12 +243,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-gp.dtb \ armada-388-helios4.dtb \ armada-38x-controlcenterdc.dtb \ - armada-7040-db-nand.dtb \ - armada-7040-db.dtb \ - armada-8040-clearfog-gt-8k.dtb \ - armada-8040-db.dtb \ - armada-8040-mcbin.dtb \ - armada-8040-puzzle-m801.dtb \ armada-xp-crs305-1g-4s.dtb \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \
@@ -263,7 +253,20 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ armada-xp-synology-ds414.dtb \ - armada-xp-theadorable.dtb \ + armada-xp-theadorable.dtb +else +dtb-$(CONFIG_ARCH_MVEBU) += \ + armada-3720-db.dtb \ + armada-3720-espressobin.dtb \ + armada-3720-turris-mox.dtb \ + armada-3720-eDPU.dtb \ + armada-3720-uDPU.dtb \ + armada-7040-db-nand.dtb \ + armada-7040-db.dtb \ + armada-8040-clearfog-gt-8k.dtb \ + armada-8040-db.dtb \ + armada-8040-mcbin.dtb \ + armada-8040-puzzle-m801.dtb \ cn9130-db-A.dtb \ cn9130-db-B.dtb \ cn9131-db-A.dtb \
@@ -272,6 +275,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ cn9132-db-B.dtb \ cn9130-crb-A.dtb \ cn9130-crb-B.dtb +endif dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
Signature · 3 lines
2.20.1 So decide what you like more for solving this issue.
Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
In reply to Stefan RoeseQuoted 18 lines · On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
Quoted 4 lines · Pali Rohár
And you bring another issue :-) U-Boot DTS files for 64-bit Armada SoCs (expects 3720) differs from kernel DTS files. They are incompatible and nobody fixed this issue yet. I fixed it only for 64-bit Armada 3720 as we are using and maintaining Armada 3720 boards.
Yes, I am aware of this.
Quoted 10 lines
So I just do not know what to do with remaining 64-bit A7040/A8040/CN9030 SoCs. I just added simple harmless change which do not change behavior nor output of those boards.
Either somebody has to start working on fixing U-Boot support and DTS files for those boards to be compatible with Linux kernel. Or those SoCs stays incompatible with Linux and their technical debt in U-Boot code just grow. Or you as maintainer can decide that they are unmaintained (and ready for removal?).
Quoted 5 lines
Quoted 1 line
I'm just not going to do this big cleanup for A7040/A8040/CN9030 SoCs too.
Understood. Let's keep the situation in this unfortunate state a while longer. Hopefully someone will find the time to work on this. If nothing changes in a longer period we should think again about this.
Ok!
Stefan Roese
Reviewed-byRe: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
In reply to Pali RohárQuoted 29 lines · Pali Rohár
Quoted 28 lines · On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
Quoted 27 lines · Pali Rohár
Quoted 11 lines · On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
Quoted 9 lines · Pali Rohár
For future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)Quoted 3 lines
You're changing 64-bit Armada files here, but in the cover letter you mention that this patchset only addresses 32-bit mvebu DT files. So why are you making these changes here?
The main issue is that 64-bit Armada DTS files are compiled also during 32-bit Armada builds. And 32-bit Armada DTS files needs spi0 reference because it is used in 32-bit Armada section in
mvebu-u-boot.dtsifile.I know it is broken build system if during compilation of 32-bit SoC are compiled also unrelated 64-bit Armada DTS files in 32-bit mode. But I do not see currently easier solution than just define "harmless" reference.
During 64-bit Armada builds is content of
mvebu-u-boot.dtsiskipped as there is a 32-bit guard.
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Proper way, of course, would be to fix build system, so none 64-bit file is compiled (and let unused) during 32-bit build.
I see. Thanks for the explanation.
I played a bit with build system and have there alternative patch instead of patch 1/5 which "fixes" makefile build system.
Thanks Pali.
Quoted 73 lines
From
78ebf95fdf4223ce62cc537a57739ba3adbf556fMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
Date: Fri, 5 Aug 2022 12:45:19 +0200
Subject: [PATCH] arm: mvebu: dts: Build only arch-compatible dts files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit64-bit Armada DTS files are not build correctly during compilation of 32-bit Armada boards and vice versa. So fix makefile build system to compile only those dts files which are compatible for the current build (64-bit Armada DTS files only for 64-bit builds and 32-bit Armada DTS files only for 32-bit builds).
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)arch/arm/dts/Makefile +15
-12@@ -232,12 +232,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra210-p2571.dtb \ tegra210-p3450-0000.dtb +ifdef CONFIG_ARMADA_32BIT dtb-$(CONFIG_ARCH_MVEBU) += \ - armada-3720-db.dtb \ - armada-3720-espressobin.dtb \ - armada-3720-turris-mox.dtb \ - armada-3720-eDPU.dtb \ - armada-3720-uDPU.dtb \ armada-375-db.dtb \ armada-385-atl-x530.dtb \ armada-385-atl-x530DP.dtb \@@ -247,12 +243,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-gp.dtb \ armada-388-helios4.dtb \ armada-38x-controlcenterdc.dtb \ - armada-7040-db-nand.dtb \ - armada-7040-db.dtb \ - armada-8040-clearfog-gt-8k.dtb \ - armada-8040-db.dtb \ - armada-8040-mcbin.dtb \ - armada-8040-puzzle-m801.dtb \ armada-xp-crs305-1g-4s.dtb \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \@@ -263,7 +253,20 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ armada-xp-synology-ds414.dtb \ - armada-xp-theadorable.dtb \ + armada-xp-theadorable.dtb +else +dtb-$(CONFIG_ARCH_MVEBU) += \ + armada-3720-db.dtb \ + armada-3720-espressobin.dtb \ + armada-3720-turris-mox.dtb \ + armada-3720-eDPU.dtb \ + armada-3720-uDPU.dtb \ + armada-7040-db-nand.dtb \ + armada-7040-db.dtb \ + armada-8040-clearfog-gt-8k.dtb \ + armada-8040-db.dtb \ + armada-8040-mcbin.dtb \ + armada-8040-puzzle-m801.dtb \ cn9130-db-A.dtb \ cn9130-db-B.dtb \ cn9131-db-A.dtb \
arch/arm/dts/Makefile dtb-$(CONFIG_ARCH_MVEBU) += \ · line 281
Quoted 7 lines
arch/arm/dts/Makefile +1
-0@@ -272,6 +275,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ cn9132-db-B.dtb \ cn9130-crb-A.dtb \ cn9130-crb-B.dtb +endif dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \
Looks good. Thanks. Could you please send this as a normal patch to the list? I'll drop patch 1/5 from this series. Feel free to add my:
Thanks,
Stefan
Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
Quoted 122 lines · On Friday 05 August 2022 12:51:54 Stefan Roese wrote:
Quoted 29 lines · Pali Rohár
Quoted 28 lines · On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
Quoted 27 lines · Pali Rohár
Quoted 11 lines · On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
Quoted 9 lines · Pali Rohár
For future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)Quoted 3 lines
You're changing 64-bit Armada files here, but in the cover letter you mention that this patchset only addresses 32-bit mvebu DT files. So why are you making these changes here?
The main issue is that 64-bit Armada DTS files are compiled also during 32-bit Armada builds. And 32-bit Armada DTS files needs spi0 reference because it is used in 32-bit Armada section in
mvebu-u-boot.dtsifile.I know it is broken build system if during compilation of 32-bit SoC are compiled also unrelated 64-bit Armada DTS files in 32-bit mode. But I do not see currently easier solution than just define "harmless" reference.
During 64-bit Armada builds is content of
mvebu-u-boot.dtsiskipped as there is a 32-bit guard.Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Proper way, of course, would be to fix build system, so none 64-bit file is compiled (and let unused) during 32-bit build.
I see. Thanks for the explanation.
I played a bit with build system and have there alternative patch instead of patch 1/5 which "fixes" makefile build system.
Thanks Pali.
Quoted 72 lines
From
78ebf95fdf4223ce62cc537a57739ba3adbf556fMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
Date: Fri, 5 Aug 2022 12:45:19 +0200
Subject: [PATCH] arm: mvebu: dts: Build only arch-compatible dts files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit64-bit Armada DTS files are not build correctly during compilation of 32-bit Armada boards and vice versa. So fix makefile build system to compile only those dts files which are compatible for the current build (64-bit Armada DTS files only for 64-bit builds and 32-bit Armada DTS files only for 32-bit builds).
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)arch/arm/dts/Makefile +15
-12@@ -232,12 +232,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra210-p2571.dtb \ tegra210-p3450-0000.dtb +ifdef CONFIG_ARMADA_32BIT dtb-$(CONFIG_ARCH_MVEBU) += \ - armada-3720-db.dtb \ - armada-3720-espressobin.dtb \ - armada-3720-turris-mox.dtb \ - armada-3720-eDPU.dtb \ - armada-3720-uDPU.dtb \ armada-375-db.dtb \ armada-385-atl-x530.dtb \ armada-385-atl-x530DP.dtb \@@ -247,12 +243,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-gp.dtb \ armada-388-helios4.dtb \ armada-38x-controlcenterdc.dtb \ - armada-7040-db-nand.dtb \ - armada-7040-db.dtb \ - armada-8040-clearfog-gt-8k.dtb \ - armada-8040-db.dtb \ - armada-8040-mcbin.dtb \ - armada-8040-puzzle-m801.dtb \ armada-xp-crs305-1g-4s.dtb \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \@@ -263,7 +253,20 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ armada-xp-synology-ds414.dtb \ - armada-xp-theadorable.dtb \ + armada-xp-theadorable.dtb +else +dtb-$(CONFIG_ARCH_MVEBU) += \ + armada-3720-db.dtb \ + armada-3720-espressobin.dtb \ + armada-3720-turris-mox.dtb \ + armada-3720-eDPU.dtb \ + armada-3720-uDPU.dtb \ + armada-7040-db-nand.dtb \ + armada-7040-db.dtb \ + armada-8040-clearfog-gt-8k.dtb \ + armada-8040-db.dtb \ + armada-8040-mcbin.dtb \ + armada-8040-puzzle-m801.dtb \ cn9130-db-A.dtb \ cn9130-db-B.dtb \ cn9131-db-A.dtb \arch/arm/dts/Makefile dtb-$(CONFIG_ARCH_MVEBU) += \ · line 280
Quoted 6 lines
arch/arm/dts/Makefile +1
-0@@ -272,6 +275,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ cn9132-db-B.dtb \ cn9130-crb-A.dtb \ cn9130-crb-B.dtb +endif dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \Looks good. Thanks. Could you please send this as a normal patch to the list? I'll drop patch 1/5 from this series. Feel free to add my:
Quoted 4 lines
Reviewed-by Stefan Roese <[email protected]>Thanks,
Stefan
Ok, if you like more this alternative patch, I will do it!
Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
Quoted 123 lines · On Friday 05 August 2022 12:55:44 Pali Rohár wrote:
Quoted 122 lines · On Friday 05 August 2022 12:51:54 Stefan Roese wrote:
Quoted 29 lines · Pali Rohár
Quoted 28 lines · On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
Quoted 27 lines · Pali Rohár
Quoted 11 lines · On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
Quoted 9 lines · Pali Rohár
For future changes it is needed for have spi0 device tree reference in every mvebu soc dts file even when it is unused.
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ arch/arm/dts/cn9130.dtsi | 3 +++ 3 files changed, 9 insertions(+)Quoted 3 lines
You're changing 64-bit Armada files here, but in the cover letter you mention that this patchset only addresses 32-bit mvebu DT files. So why are you making these changes here?
The main issue is that 64-bit Armada DTS files are compiled also during 32-bit Armada builds. And 32-bit Armada DTS files needs spi0 reference because it is used in 32-bit Armada section in
mvebu-u-boot.dtsifile.I know it is broken build system if during compilation of 32-bit SoC are compiled also unrelated 64-bit Armada DTS files in 32-bit mode. But I do not see currently easier solution than just define "harmless" reference.
During 64-bit Armada builds is content of
mvebu-u-boot.dtsiskipped as there is a 32-bit guard.Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Proper way, of course, would be to fix build system, so none 64-bit file is compiled (and let unused) during 32-bit build.
I see. Thanks for the explanation.
I played a bit with build system and have there alternative patch instead of patch 1/5 which "fixes" makefile build system.
Thanks Pali.
Quoted 72 lines
From
78ebf95fdf4223ce62cc537a57739ba3adbf556fMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <[email protected]>
Date: Fri, 5 Aug 2022 12:45:19 +0200
Subject: [PATCH] arm: mvebu: dts: Build only arch-compatible dts files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit64-bit Armada DTS files are not build correctly during compilation of 32-bit Armada boards and vice versa. So fix makefile build system to compile only those dts files which are compatible for the current build (64-bit Armada DTS files only for 64-bit builds and 32-bit Armada DTS files only for 32-bit builds).
Signed-off-by Pali Rohár <[email protected]>--- arch/arm/dts/Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)arch/arm/dts/Makefile +15
-12@@ -232,12 +232,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra210-p2571.dtb \ tegra210-p3450-0000.dtb +ifdef CONFIG_ARMADA_32BIT dtb-$(CONFIG_ARCH_MVEBU) += \ - armada-3720-db.dtb \ - armada-3720-espressobin.dtb \ - armada-3720-turris-mox.dtb \ - armada-3720-eDPU.dtb \ - armada-3720-uDPU.dtb \ armada-375-db.dtb \ armada-385-atl-x530.dtb \ armada-385-atl-x530DP.dtb \@@ -247,12 +243,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-388-gp.dtb \ armada-388-helios4.dtb \ armada-38x-controlcenterdc.dtb \ - armada-7040-db-nand.dtb \ - armada-7040-db.dtb \ - armada-8040-clearfog-gt-8k.dtb \ - armada-8040-db.dtb \ - armada-8040-mcbin.dtb \ - armada-8040-puzzle-m801.dtb \ armada-xp-crs305-1g-4s.dtb \ armada-xp-crs305-1g-4s-bit.dtb \ armada-xp-crs326-24g-2s.dtb \@@ -263,7 +253,20 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ armada-xp-synology-ds414.dtb \ - armada-xp-theadorable.dtb \ + armada-xp-theadorable.dtb +else +dtb-$(CONFIG_ARCH_MVEBU) += \ + armada-3720-db.dtb \ + armada-3720-espressobin.dtb \ + armada-3720-turris-mox.dtb \ + armada-3720-eDPU.dtb \ + armada-3720-uDPU.dtb \ + armada-7040-db-nand.dtb \ + armada-7040-db.dtb \ + armada-8040-clearfog-gt-8k.dtb \ + armada-8040-db.dtb \ + armada-8040-mcbin.dtb \ + armada-8040-puzzle-m801.dtb \ cn9130-db-A.dtb \ cn9130-db-B.dtb \ cn9131-db-A.dtb \arch/arm/dts/Makefile dtb-$(CONFIG_ARCH_MVEBU) += \ · line 280
Quoted 6 lines
arch/arm/dts/Makefile +1
-0@@ -272,6 +275,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ cn9132-db-B.dtb \ cn9130-crb-A.dtb \ cn9130-crb-B.dtb +endif dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \Looks good. Thanks. Could you please send this as a normal patch to the list? I'll drop patch 1/5 from this series. Feel free to add my:
Quoted 6 lines
Quoted 4 lines
Reviewed-by Stefan Roese <[email protected]>Thanks,
StefanOk, if you like more this alternative patch, I will do it!
Here it is: https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Quoted 9 lines · Pali Rohár
This patch series cleanup u-boot,dm-pre-reloc code in 32-bit mvebu device tree files. All repeated code patterns are moved into the new
mvebu-u-boot.dtsifile which is automatically included by U-Boot build process into all mvebu boards. In filemvebu-u-boot.dtsiis also enabled u-boot,dm-pre-reloc for SPI node when SPL is compiled with SPI driver for loading proper U-Boot. This avoids manually defining
&spi0 { u-boot,dm-pre-reloc; };
in every armada soc which store U-Boot in SPI NOR.
Quoted 7 lines
I tested this patch series only on Armada 385 Turris Omnia board (both UART and SPI-NOR booting). Please test it on other Armada boards.
CI tests were running at:
https://github.com/u-boot/u-boot/pull/203
But some x86 test failed, which must be irrelevant as this patch series did not touch code outside ofarch/arm/.
Patch 1/5 not, all others:
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 42 lines
Pali Rohár (5):
arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
arm: mvebu: Introducemvebu-u-boot.dtsifor 32-bit Armada SoCs
arm: mvebu: Remove redundant u-boot,dm-pre-reloc from all 32-bit
Armada SoCs
arm: mvebu:armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc to
-u-boot.dtsi
arm: mvebu:armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc
to-u-boot.dtsiarch/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 ++ .../armada-38x-controlcenterdc-u-boot.dtsi | 25 +++++++++++++++++++ arch/arm/dts/armada-38x-controlcenterdc.dts | 20 --------------- .../arm/dts/armada-38x-solidrun-microsom.dtsi | 1 - arch/arm/dts/armada-38x.dtsi | 2 -- arch/arm/dts/armada-7040.dtsi | 3 +++ arch/arm/dts/armada-8040.dtsi | 3 +++ .../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 - .../arm/dts/armada-xp-theadorable-u-boot.dtsi | 5 ++++ arch/arm/dts/armada-xp-theadorable.dts | 4 --- arch/arm/dts/armada-xp.dtsi | 1 - arch/arm/dts/cn9130.dtsi | 3 +++ arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++ 31 files changed, 71 insertions(+), 142 deletions(-)
Quoted 9 lines
create mode 100644
arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-crs305-1g-4s-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-crs326-24g-2s-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-crs328-4c-20s-4s-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-gp-u-boot.dtsidelete mode 100644arch/arm/dts/armada-xp-synology-ds414-u-boot.dtsicreate mode 100644arch/arm/dts/armada-xp-theadorable-u-boot.dtsicreate mode 100644arch/arm/dts/mvebu-u-boot.dtsi
Viele Grüße,
Stefan Roese
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]