All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code
@ 2022-08-03 11:00 Pali Rohár
  2022-08-03 11:00 ` [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference Pali Rohár
                   ` (6 more replies)
  0 siblings, 7 replies; 20+ messages in thread
From: Pali Rohár @ 2022-08-03 11:00 UTC (permalink / raw)
  To: Stefan Roese, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

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

-- 
2.20.1


^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
@ 2022-08-03 11:00 ` Pali Rohár
  2022-08-04 14:51   ` Stefan Roese
  2022-08-03 11:00 ` [PATCH 2/5] arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs Pali Rohár
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-03 11:00 UTC (permalink / raw)
  To: Stefan Roese, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

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 <pali@kernel.org>
---
 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(+)

diff --git a/arch/arm/dts/armada-7040.dtsi b/arch/arm/dts/armada-7040.dtsi
index 039d30c72a8c..1fb21c6bfde0 100644
--- a/arch/arm/dts/armada-7040.dtsi
+++ b/arch/arm/dts/armada-7040.dtsi
@@ -63,3 +63,6 @@
 		marvell,function = <3>;
 	};
 };
+
+spi0: &cp0_spi1 {
+};
diff --git a/arch/arm/dts/armada-8040.dtsi b/arch/arm/dts/armada-8040.dtsi
index eec5fa277405..608ff0d97f95 100644
--- a/arch/arm/dts/armada-8040.dtsi
+++ b/arch/arm/dts/armada-8040.dtsi
@@ -87,3 +87,6 @@
 		marvell,function = <3>;
 	};
 };
+
+spi0: &cp1_spi1 {
+};
diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi
index 68b767a70639..a200276f7a2e 100644
--- a/arch/arm/dts/cn9130.dtsi
+++ b/arch/arm/dts/cn9130.dtsi
@@ -71,3 +71,6 @@
 		marvell,function = <3>;
 	};
 };
+
+spi0: &cp0_spi1 {
+};
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 2/5] arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs
  2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
  2022-08-03 11:00 ` [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference Pali Rohár
@ 2022-08-03 11:00 ` Pali Rohár
  2022-08-04 14:52   ` Stefan Roese
  2022-08-03 11:00 ` [PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all " Pali Rohár
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-03 11:00 UTC (permalink / raw)
  To: Stefan Roese, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

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 <pali@kernel.org>
---
 arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 arch/arm/dts/mvebu-u-boot.dtsi

diff --git a/arch/arm/dts/mvebu-u-boot.dtsi b/arch/arm/dts/mvebu-u-boot.dtsi
new file mode 100644
index 000000000000..5538f95148de
--- /dev/null
+++ b/arch/arm/dts/mvebu-u-boot.dtsi
@@ -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
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all 32-bit Armada SoCs
  2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
  2022-08-03 11:00 ` [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference Pali Rohár
  2022-08-03 11:00 ` [PATCH 2/5] arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs Pali Rohár
@ 2022-08-03 11:00 ` Pali Rohár
  2022-08-04 14:54   ` Stefan Roese
  2022-08-03 11:00 ` [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi Pali Rohár
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-03 11:00 UTC (permalink / raw)
  To: Stefan Roese, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

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


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi
  2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
                   ` (2 preceding siblings ...)
  2022-08-03 11:00 ` [PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all " Pali Rohár
@ 2022-08-03 11:00 ` Pali Rohár
  2022-08-04 14:42   ` [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc " Stefan Roese
  2022-08-03 11:00 ` [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot, dm-pre-reloc " Pali Rohár
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-03 11:00 UTC (permalink / raw)
  To: Stefan Roese, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

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 <pali@kernel.org>
---
 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

diff --git a/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi b/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
new file mode 100644
index 000000000000..c98bfa1e18da
--- /dev/null
+++ b/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
@@ -0,0 +1,5 @@
+&lcd0 {
+	u-boot,dm-pre-reloc;
+};
+
+#include "mvebu-u-boot.dtsi"
diff --git a/arch/arm/dts/armada-xp-theadorable.dts b/arch/arm/dts/armada-xp-theadorable.dts
index 2f6aa194cf0f..ba73386d4f0a 100644
--- a/arch/arm/dts/armada-xp-theadorable.dts
+++ b/arch/arm/dts/armada-xp-theadorable.dts
@@ -134,7 +134,6 @@
 				compatible = "marvell,armada-xp-lcd";
 				reg = <0xe0000 0x10000>;
 				status = "okay";
-				u-boot,dm-pre-reloc;
 
 				display-timings {
 					native-mode = <&timing0>;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi
  2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
                   ` (3 preceding siblings ...)
  2022-08-03 11:00 ` [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi Pali Rohár
@ 2022-08-03 11:00 ` Pali Rohár
  2022-08-04 14:54   ` [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc " Stefan Roese
  2022-08-04  1:24 ` [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Tony Dinh
  2022-08-09 11:34 ` Stefan Roese
  6 siblings, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-03 11:00 UTC (permalink / raw)
  To: Stefan Roese, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

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 <pali@kernel.org>
---
 .../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

diff --git a/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
new file mode 100644
index 000000000000..0a94df923058
--- /dev/null
+++ b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
@@ -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"
diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
index b5d76f8b22d6..79ea6f090958 100644
--- a/arch/arm/dts/armada-38x-controlcenterdc.dts
+++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
@@ -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;
 	};
 };
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 20+ messages in thread
* Re: [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code
  2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
                   ` (4 preceding siblings ...)
  2022-08-03 11:00 ` [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot, dm-pre-reloc " Pali Rohár
@ 2022-08-04  1:24 ` Tony Dinh
  2022-08-09 11:34 ` Stefan Roese
  6 siblings, 0 replies; 20+ messages in thread
From: Tony Dinh @ 2022-08-04  1:24 UTC (permalink / raw)
  To: Pali Rohár
  Cc: Stefan Roese, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, U-Boot Mailing List

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).
Tested-by: Tony Dinh <mibodhi@gmail.com>

Thanks,
Tony

On Wed, Aug 3, 2022 at 4:01 AM Pali Rohár <pali@kernel.org> wrote:
>
> 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
>
> --
> 2.20.1
>

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc to -u-boot.dtsi
  2022-08-03 11:00 ` [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi Pali Rohár
@ 2022-08-04 14:42   ` Stefan Roese
  0 siblings, 0 replies; 20+ messages in thread
From: Stefan Roese @ 2022-08-04 14:42 UTC (permalink / raw)
  To: Pali Rohár, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

On 03.08.22 13:00, Pali Rohár wrote:
> 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 <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   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
> 
> diff --git a/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi b/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
> new file mode 100644
> index 000000000000..c98bfa1e18da
> --- /dev/null
> +++ b/arch/arm/dts/armada-xp-theadorable-u-boot.dtsi
> @@ -0,0 +1,5 @@
> +&lcd0 {
> +	u-boot,dm-pre-reloc;
> +};
> +
> +#include "mvebu-u-boot.dtsi"
> diff --git a/arch/arm/dts/armada-xp-theadorable.dts b/arch/arm/dts/armada-xp-theadorable.dts
> index 2f6aa194cf0f..ba73386d4f0a 100644
> --- a/arch/arm/dts/armada-xp-theadorable.dts
> +++ b/arch/arm/dts/armada-xp-theadorable.dts
> @@ -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

-- 
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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-03 11:00 ` [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference Pali Rohár
@ 2022-08-04 14:51   ` Stefan Roese
  2022-08-04 15:07     ` Pali Rohár
  0 siblings, 1 reply; 20+ messages in thread
From: Stefan Roese @ 2022-08-04 14:51 UTC (permalink / raw)
  To: Pali Rohár, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

On 03.08.22 13:00, Pali Rohár wrote:
> 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 <pali@kernel.org>
> ---
>   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...

> diff --git a/arch/arm/dts/armada-7040.dtsi b/arch/arm/dts/armada-7040.dtsi
> index 039d30c72a8c..1fb21c6bfde0 100644
> --- a/arch/arm/dts/armada-7040.dtsi
> +++ b/arch/arm/dts/armada-7040.dtsi
> @@ -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

> diff --git a/arch/arm/dts/armada-8040.dtsi b/arch/arm/dts/armada-8040.dtsi
> index eec5fa277405..608ff0d97f95 100644
> --- a/arch/arm/dts/armada-8040.dtsi
> +++ b/arch/arm/dts/armada-8040.dtsi
> @@ -87,3 +87,6 @@
>   		marvell,function = <3>;
>   	};
>   };
> +
> +spi0: &cp1_spi1 {
> +};
> diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi
> index 68b767a70639..a200276f7a2e 100644
> --- a/arch/arm/dts/cn9130.dtsi
> +++ b/arch/arm/dts/cn9130.dtsi
> @@ -71,3 +71,6 @@
>   		marvell,function = <3>;
>   	};
>   };
> +
> +spi0: &cp0_spi1 {
> +};

Viele Grüße,
Stefan Roese

-- 
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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 2/5] arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs
  2022-08-03 11:00 ` [PATCH 2/5] arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs Pali Rohár
@ 2022-08-04 14:52   ` Stefan Roese
  0 siblings, 0 replies; 20+ messages in thread
From: Stefan Roese @ 2022-08-04 14:52 UTC (permalink / raw)
  To: Pali Rohár, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

On 03.08.22 13:00, Pali Rohár wrote:
> 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 <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   arch/arm/dts/mvebu-u-boot.dtsi | 24 ++++++++++++++++++++++++
>   1 file changed, 24 insertions(+)
>   create mode 100644 arch/arm/dts/mvebu-u-boot.dtsi
> 
> diff --git a/arch/arm/dts/mvebu-u-boot.dtsi b/arch/arm/dts/mvebu-u-boot.dtsi
> new file mode 100644
> index 000000000000..5538f95148de
> --- /dev/null
> +++ b/arch/arm/dts/mvebu-u-boot.dtsi
> @@ -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

Viele Grüße,
Stefan Roese

-- 
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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all 32-bit Armada SoCs
  2022-08-03 11:00 ` [PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all " Pali Rohár
@ 2022-08-04 14:54   ` Stefan Roese
  0 siblings, 0 replies; 20+ messages in thread
From: Stefan Roese @ 2022-08-04 14:54 UTC (permalink / raw)
  To: Pali Rohár, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

On 03.08.22 13:00, Pali Rohár wrote:
> 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>
> ---
>   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

Very nice diffstat. :)

Reviewed-by: Stefan Roese <sr@denx.de>
Tested-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan


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

Viele Grüße,
Stefan Roese

-- 
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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc to -u-boot.dtsi
  2022-08-03 11:00 ` [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot, dm-pre-reloc " Pali Rohár
@ 2022-08-04 14:54   ` Stefan Roese
  0 siblings, 0 replies; 20+ messages in thread
From: Stefan Roese @ 2022-08-04 14:54 UTC (permalink / raw)
  To: Pali Rohár, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

On 03.08.22 13:00, Pali Rohár wrote:
> 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 <pali@kernel.org>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
>   .../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
> 
> diff --git a/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
> new file mode 100644
> index 000000000000..0a94df923058
> --- /dev/null
> +++ b/arch/arm/dts/armada-38x-controlcenterdc-u-boot.dtsi
> @@ -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"
> diff --git a/arch/arm/dts/armada-38x-controlcenterdc.dts b/arch/arm/dts/armada-38x-controlcenterdc.dts
> index b5d76f8b22d6..79ea6f090958 100644
> --- a/arch/arm/dts/armada-38x-controlcenterdc.dts
> +++ b/arch/arm/dts/armada-38x-controlcenterdc.dts
> @@ -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;
>   	};
>   };

Viele Grüße,
Stefan Roese

-- 
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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-04 14:51   ` Stefan Roese
@ 2022-08-04 15:07     ` Pali Rohár
  2022-08-05 10:25       ` Stefan Roese
  0 siblings, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-04 15:07 UTC (permalink / raw)
  To: Stefan Roese
  Cc: Tony Dinh, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, u-boot

On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
> On 03.08.22 13:00, Pali Rohár wrote:
> > 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 <pali@kernel.org>
> > ---
> >   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?

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.

> One more comment below...
> 
> > diff --git a/arch/arm/dts/armada-7040.dtsi b/arch/arm/dts/armada-7040.dtsi
> > index 039d30c72a8c..1fb21c6bfde0 100644
> > --- a/arch/arm/dts/armada-7040.dtsi
> > +++ b/arch/arm/dts/armada-7040.dtsi
> > @@ -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.

> 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.

> Thanks,
> Stefan
> 
> > diff --git a/arch/arm/dts/armada-8040.dtsi b/arch/arm/dts/armada-8040.dtsi
> > index eec5fa277405..608ff0d97f95 100644
> > --- a/arch/arm/dts/armada-8040.dtsi
> > +++ b/arch/arm/dts/armada-8040.dtsi
> > @@ -87,3 +87,6 @@
> >   		marvell,function = <3>;
> >   	};
> >   };
> > +
> > +spi0: &cp1_spi1 {
> > +};
> > diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi
> > index 68b767a70639..a200276f7a2e 100644
> > --- a/arch/arm/dts/cn9130.dtsi
> > +++ b/arch/arm/dts/cn9130.dtsi
> > @@ -71,3 +71,6 @@
> >   		marvell,function = <3>;
> >   	};
> >   };
> > +
> > +spi0: &cp0_spi1 {
> > +};
> 
> Viele Grüße,
> Stefan Roese
> 
> -- 
> 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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-04 15:07     ` Pali Rohár
@ 2022-08-05 10:25       ` Stefan Roese
  2022-08-05 10:48         ` Pali Rohár
  2022-08-05 10:49         ` Pali Rohár
  0 siblings, 2 replies; 20+ messages in thread
From: Stefan Roese @ 2022-08-05 10:25 UTC (permalink / raw)
  To: Pali Rohár
  Cc: Tony Dinh, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, u-boot

On 04.08.22 17:07, Pali Rohár wrote:
> On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
>> On 03.08.22 13:00, Pali Rohár wrote:
>>> 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 <pali@kernel.org>
>>> ---
>>>    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?
> 
> 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.

I see. Thanks for the explanation.

>> One more comment below...
>>
>>> diff --git a/arch/arm/dts/armada-7040.dtsi b/arch/arm/dts/armada-7040.dtsi
>>> index 039d30c72a8c..1fb21c6bfde0 100644
>>> --- a/arch/arm/dts/armada-7040.dtsi
>>> +++ b/arch/arm/dts/armada-7040.dtsi
>>> @@ -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.
> 
>> 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.

Yes, I am aware of this.

> 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

>> Thanks,
>> Stefan
>>
>>> diff --git a/arch/arm/dts/armada-8040.dtsi b/arch/arm/dts/armada-8040.dtsi
>>> index eec5fa277405..608ff0d97f95 100644
>>> --- a/arch/arm/dts/armada-8040.dtsi
>>> +++ b/arch/arm/dts/armada-8040.dtsi
>>> @@ -87,3 +87,6 @@
>>>    		marvell,function = <3>;
>>>    	};
>>>    };
>>> +
>>> +spi0: &cp1_spi1 {
>>> +};
>>> diff --git a/arch/arm/dts/cn9130.dtsi b/arch/arm/dts/cn9130.dtsi
>>> index 68b767a70639..a200276f7a2e 100644
>>> --- a/arch/arm/dts/cn9130.dtsi
>>> +++ b/arch/arm/dts/cn9130.dtsi
>>> @@ -71,3 +71,6 @@
>>>    		marvell,function = <3>;
>>>    	};
>>>    };
>>> +
>>> +spi0: &cp0_spi1 {
>>> +};
>>
>> Viele Grüße,
>> Stefan Roese
>>
>> -- 
>> 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: sr@denx.de

Viele Grüße,
Stefan Roese

-- 
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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-05 10:25       ` Stefan Roese
@ 2022-08-05 10:48         ` Pali Rohár
  2022-08-05 10:51           ` Stefan Roese
  2022-08-05 10:49         ` Pali Rohár
  1 sibling, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-05 10:48 UTC (permalink / raw)
  To: Stefan Roese
  Cc: Tony Dinh, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, u-boot

On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
> On 04.08.22 17:07, Pali Rohár wrote:
> > On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
> > > On 03.08.22 13:00, Pali Rohár wrote:
> > > > 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 <pali@kernel.org>
> > > > ---
> > > >    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?
> > 
> > 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.
> 
> 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?= <pali@kernel.org>
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).

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 arch/arm/dts/Makefile | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index ceaa39e4b4d6..7330121dbaba 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -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) += \
-- 
2.20.1

So decide what you like more for solving this issue.

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-05 10:25       ` Stefan Roese
  2022-08-05 10:48         ` Pali Rohár
@ 2022-08-05 10:49         ` Pali Rohár
  1 sibling, 0 replies; 20+ messages in thread
From: Pali Rohár @ 2022-08-05 10:49 UTC (permalink / raw)
  To: Stefan Roese
  Cc: Tony Dinh, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, u-boot

On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
> On 04.08.22 17:07, Pali Rohár wrote:
> > 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.
> 
> > 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.

Ok!

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-05 10:48         ` Pali Rohár
@ 2022-08-05 10:51           ` Stefan Roese
  2022-08-05 10:55             ` Pali Rohár
  0 siblings, 1 reply; 20+ messages in thread
From: Stefan Roese @ 2022-08-05 10:51 UTC (permalink / raw)
  To: Pali Rohár
  Cc: Tony Dinh, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, u-boot

On 05.08.22 12:48, Pali Rohár wrote:
> On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
>> On 04.08.22 17:07, Pali Rohár wrote:
>>> On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
>>>> On 03.08.22 13:00, Pali Rohár wrote:
>>>>> 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 <pali@kernel.org>
>>>>> ---
>>>>>     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?
>>>
>>> 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.
>>
>> 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.

>  From 78ebf95fdf4223ce62cc537a57739ba3adbf556f Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
> 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).
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>
> ---
>   arch/arm/dts/Makefile | 28 ++++++++++++++++------------
>   1 file changed, 16 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index ceaa39e4b4d6..7330121dbaba 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -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) += \

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:

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-05 10:51           ` Stefan Roese
@ 2022-08-05 10:55             ` Pali Rohár
  2022-08-05 11:38               ` Pali Rohár
  0 siblings, 1 reply; 20+ messages in thread
From: Pali Rohár @ 2022-08-05 10:55 UTC (permalink / raw)
  To: Stefan Roese
  Cc: Tony Dinh, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, u-boot

On Friday 05 August 2022 12:51:54 Stefan Roese wrote:
> On 05.08.22 12:48, Pali Rohár wrote:
> > On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
> > > On 04.08.22 17:07, Pali Rohár wrote:
> > > > On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
> > > > > On 03.08.22 13:00, Pali Rohár wrote:
> > > > > > 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 <pali@kernel.org>
> > > > > > ---
> > > > > >     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?
> > > > 
> > > > 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.
> > > 
> > > 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.
> 
> >  From 78ebf95fdf4223ce62cc537a57739ba3adbf556f Mon Sep 17 00:00:00 2001
> > From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
> > 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).
> > 
> > Signed-off-by: Pali Rohár <pali@kernel.org>
> > ---
> >   arch/arm/dts/Makefile | 28 ++++++++++++++++------------
> >   1 file changed, 16 insertions(+), 12 deletions(-)
> > 
> > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > index ceaa39e4b4d6..7330121dbaba 100644
> > --- a/arch/arm/dts/Makefile
> > +++ b/arch/arm/dts/Makefile
> > @@ -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) += \
> 
> 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:
> 
> Reviewed-by: Stefan Roese <sr@denx.de>
> 
> Thanks,
> Stefan

Ok, if you like more this alternative patch, I will do it!

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference
  2022-08-05 10:55             ` Pali Rohár
@ 2022-08-05 11:38               ` Pali Rohár
  0 siblings, 0 replies; 20+ messages in thread
From: Pali Rohár @ 2022-08-05 11:38 UTC (permalink / raw)
  To: Stefan Roese
  Cc: Tony Dinh, Marek Behún, Luka Kovacic, Luka Perkov,
	Robert Marko, Michael Trimarchi, Mark Kettenis, Simon Glass,
	Jaehoon Chung, u-boot

On Friday 05 August 2022 12:55:44 Pali Rohár wrote:
> On Friday 05 August 2022 12:51:54 Stefan Roese wrote:
> > On 05.08.22 12:48, Pali Rohár wrote:
> > > On Friday 05 August 2022 12:25:55 Stefan Roese wrote:
> > > > On 04.08.22 17:07, Pali Rohár wrote:
> > > > > On Thursday 04 August 2022 16:51:47 Stefan Roese wrote:
> > > > > > On 03.08.22 13:00, Pali Rohár wrote:
> > > > > > > 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 <pali@kernel.org>
> > > > > > > ---
> > > > > > >     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?
> > > > > 
> > > > > 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.
> > > > 
> > > > 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.
> > 
> > >  From 78ebf95fdf4223ce62cc537a57739ba3adbf556f Mon Sep 17 00:00:00 2001
> > > From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
> > > 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).
> > > 
> > > Signed-off-by: Pali Rohár <pali@kernel.org>
> > > ---
> > >   arch/arm/dts/Makefile | 28 ++++++++++++++++------------
> > >   1 file changed, 16 insertions(+), 12 deletions(-)
> > > 
> > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> > > index ceaa39e4b4d6..7330121dbaba 100644
> > > --- a/arch/arm/dts/Makefile
> > > +++ b/arch/arm/dts/Makefile
> > > @@ -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) += \
> > 
> > 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:
> > 
> > Reviewed-by: Stefan Roese <sr@denx.de>
> > 
> > Thanks,
> > Stefan
> 
> Ok, if you like more this alternative patch, I will do it!

Here it is: https://patchwork.ozlabs.org/project/uboot/patch/20220805113725.28130-1-pali@kernel.org/

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code
  2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
                   ` (5 preceding siblings ...)
  2022-08-04  1:24 ` [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Tony Dinh
@ 2022-08-09 11:34 ` Stefan Roese
  6 siblings, 0 replies; 20+ messages in thread
From: Stefan Roese @ 2022-08-09 11:34 UTC (permalink / raw)
  To: Pali Rohár, Tony Dinh
  Cc: Marek Behún, Luka Kovacic, Luka Perkov, Robert Marko,
	Michael Trimarchi, Mark Kettenis, Simon Glass, Jaehoon Chung,
	u-boot

On 03.08.22 13:00, Pali Rohár wrote:
> 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/.

Patch 1/5 not, all others:

Applied to u-boot-marvell/master

Thanks,
Stefan


> 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
> 

Viele Grüße,
Stefan Roese

-- 
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: sr@denx.de

^ permalink raw reply	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2022-08-09 11:34 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-03 11:00 [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Pali Rohár
2022-08-03 11:00 ` [PATCH 1/5] arm: mvebu: a7040/a8040/cn9130: Add spi0 dts reference Pali Rohár
2022-08-04 14:51   ` Stefan Roese
2022-08-04 15:07     ` Pali Rohár
2022-08-05 10:25       ` Stefan Roese
2022-08-05 10:48         ` Pali Rohár
2022-08-05 10:51           ` Stefan Roese
2022-08-05 10:55             ` Pali Rohár
2022-08-05 11:38               ` Pali Rohár
2022-08-05 10:49         ` Pali Rohár
2022-08-03 11:00 ` [PATCH 2/5] arm: mvebu: Introduce mvebu-u-boot.dtsi for 32-bit Armada SoCs Pali Rohár
2022-08-04 14:52   ` Stefan Roese
2022-08-03 11:00 ` [PATCH 3/5] arm: mvebu: Remove redundant u-boot, dm-pre-reloc from all " Pali Rohár
2022-08-04 14:54   ` Stefan Roese
2022-08-03 11:00 ` [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot, dm-pre-reloc to -u-boot.dtsi Pali Rohár
2022-08-04 14:42   ` [PATCH 4/5] arm: mvebu: armada-xp-theadorable.dts: Move u-boot,dm-pre-reloc " Stefan Roese
2022-08-03 11:00 ` [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot, dm-pre-reloc " Pali Rohár
2022-08-04 14:54   ` [PATCH 5/5] arm: mvebu: armada-38x-controlcenterdc.dts: Move u-boot,dm-pre-reloc " Stefan Roese
2022-08-04  1:24 ` [PATCH 0/5] arm: mvebu: Cleanup u-boot,dm-pre-reloc code Tony Dinh
2022-08-09 11:34 ` Stefan Roese

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.