Skip to contentSkip to conversation

ARM: opos6ul: make the board boot again

PATCH New Sébastien Szymanski 3 participants 4 messages Sep 6, 2018 – Sep 20, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ARM: opos6ul: make the board boot again

Commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl") removes the u-boot,dm-spl properties from the imx6ul.dtsi file and breaks the OPOS6UL board.
Add the u-boot,dm-spl properties into *-u-boot.dts files to make the board boot again.

Fixes commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl")

---

Changes for v3:
- use the automatic inclusion of -u-boot.dtsi mechanism of U-Boot.

Changes for v2:
- put u-boot,dm-spl properties into -u-boot.dts files

 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi    | 28 ++++++++++++++++++++++++++++
 arch/arm/dts/imx6ul-opos6ul.dtsi           |  2 --
 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 24 ++++++++++++++++++++++++
 arch/arm/dts/imx6ul-opos6uldev.dts         |  2 --
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi new file +28 -0
new file mode 100644
index 0000000000..4918de388e
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source extras for U-Boot for the OPOS6UL SoM
+ *
+ * Copyright (C) 2018 Armadeus Systems <[email protected]>
+ */
+
+/ {
+	soc {
+		u-boot,dm-spl;
+	};
+};
+
+&aips2 {
+	u-boot,dm-spl;
+};
+
+&iomuxc {
+	u-boot,dm-spl;
+};
+
+&pinctrl_usdhc1 {
+	u-boot,dm-spl;
+};
+
+&usdhc1 {
+	u-boot,dm-spl;
+};
arch/arm/dts/imx6ul-opos6ul.dtsi +0 -2
index d51ad4de20..8f16a0a81c 100644
@@ -99,7 +99,6 @@
 
 /* eMMC */
 &usdhc1 {
-	u-boot,dm-spl;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc1>;
 	bus-width = <8>;
@@ -162,7 +161,6 @@
 	};
 
 	pinctrl_usdhc1: usdhc1grp {
-		u-boot,dm-spl;
 		fsl,pins = <
 			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x17059
 			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x10059
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi new file +24 -0
new file mode 100644
index 0000000000..da8b0392ef
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source extras for U-Boot for the OPOS6ULDev board
+ *
+ * Copyright (C) 2018 Armadeus Systems <[email protected]>
+ */
+
+#include "imx6ul-opos6ul-u-boot.dtsi"
+
+&aips1 {
+	u-boot,dm-spl;
+
+	spba-bus at 02000000 {
+		u-boot,dm-spl;
+	};
+};
+
+&pinctrl_uart1 {
+	u-boot,dm-spl;
+};
+
+&uart1 {
+	u-boot,dm-spl;
+};
arch/arm/dts/imx6ul-opos6uldev.dts +0 -2
index 9a51d1e54f..0e59ee57fd 100644
@@ -228,7 +228,6 @@
 };
 
 &uart1 {
-	u-boot,dm-spl;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart1>;
 	status = "okay";
@@ -374,7 +373,6 @@
 	};
 
 	pinctrl_uart1: uart1grp {
-		u-boot,dm-spl;
 		fsl,pins = <
 			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX	0x1b0b1
 			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX	0x1b0b1
Signature · 1 line
2.16.4
#1 lore raw

PATCH v3 1/1 ARM: opos6ul: make the board boot again

Quoted 8 lines · Sébastien Szymanski

Commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl") removes the u-boot,dm-spl properties from the imx6ul.dtsi file and breaks the OPOS6UL board.
Add the u-boot,dm-spl properties into *-u-boot.dts files to make the board boot again.

Fixes commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl")
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180906/f2a32af4/attachment.sig>
#2 lore raw

PATCH v3 1/1 ARM: opos6ul: make the board boot again

In reply to Sébastien Szymanski
Quoted 122 lines · Sébastien Szymanski

Commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl") removes the u-boot,dm-spl properties from the imx6ul.dtsi file and breaks the OPOS6UL board.
Add the u-boot,dm-spl properties into *-u-boot.dts files to make the board boot again.

Fixes commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl")

---

Changes for v3:
- use the automatic inclusion of -u-boot.dtsi mechanism of U-Boot.

Changes for v2:
- put u-boot,dm-spl properties into -u-boot.dts files

 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi    | 28 ++++++++++++++++++++++++++++
 arch/arm/dts/imx6ul-opos6ul.dtsi           |  2 --
 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 24 ++++++++++++++++++++++++
 arch/arm/dts/imx6ul-opos6uldev.dts         |  2 --
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi
arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi new file +28 -0
new file mode 100644
index 0000000000..4918de388e
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source extras for U-Boot for the OPOS6UL SoM
+ *
+ * Copyright (C) 2018 Armadeus Systems <[email protected]>
+ */
+
+/ {
+	soc {
+		u-boot,dm-spl;
+	};
+};
+
+&aips2 {
+	u-boot,dm-spl;
+};
+
+&iomuxc {
+	u-boot,dm-spl;
+};
+
+&pinctrl_usdhc1 {
+	u-boot,dm-spl;
+};
+
+&usdhc1 {
+	u-boot,dm-spl;
+};
arch/arm/dts/imx6ul-opos6ul.dtsi +0 -2
index d51ad4de20..8f16a0a81c 100644
@@ -99,7 +99,6 @@
 
 /* eMMC */
 &usdhc1 {
-	u-boot,dm-spl;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc1>;
 	bus-width = <8>;
@@ -162,7 +161,6 @@
 	};
 
 	pinctrl_usdhc1: usdhc1grp {
-		u-boot,dm-spl;
 		fsl,pins = <
 			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x17059
 			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x10059
arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi new file +24 -0
new file mode 100644
index 0000000000..da8b0392ef
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source extras for U-Boot for the OPOS6ULDev board
+ *
+ * Copyright (C) 2018 Armadeus Systems <[email protected]>
+ */
+
+#include "imx6ul-opos6ul-u-boot.dtsi"
+
+&aips1 {
+	u-boot,dm-spl;
+
+	spba-bus at 02000000 {
+		u-boot,dm-spl;
+	};
+};
+
+&pinctrl_uart1 {
+	u-boot,dm-spl;
+};
+
+&uart1 {
+	u-boot,dm-spl;
+};
arch/arm/dts/imx6ul-opos6uldev.dts +0 -1
index 9a51d1e54f..0e59ee57fd 100644
@@ -228,7 +228,6 @@
 };
 
 &uart1 {
-	u-boot,dm-spl;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart1>;
 	status = "okay";

arch/arm/dts/imx6ul-opos6uldev.dts line 378

Quoted 7 lines
arch/arm/dts/imx6ul-opos6uldev.dts +0 -1
@@ -374,7 +373,6 @@
 	};
 
 	pinctrl_uart1: uart1grp {
-		u-boot,dm-spl;
 		fsl,pins = <
 			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX	0x1b0b1
 			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX	0x1b0b1

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH v3 1/1 ARM: opos6ul: make the board boot again

Hello,

Quoted 25 lines · Stefano Babic
Quoted 24 lines · Sébastien Szymanski

Commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl") removes the u-boot,dm-spl properties from the imx6ul.dtsi file and breaks the OPOS6UL board.
Add the u-boot,dm-spl properties into *-u-boot.dts files to make the board boot again.

Fixes commit 9faa43c4b5e5 ("ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl")

---

Changes for v3:
- use the automatic inclusion of -u-boot.dtsi mechanism of U-Boot.

Changes for v2:
- put u-boot,dm-spl properties into -u-boot.dts files

 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi    | 28 ++++++++++++++++++++++++++++
 arch/arm/dts/imx6ul-opos6ul.dtsi           |  2 --
 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi | 24 ++++++++++++++++++++++++
 arch/arm/dts/imx6ul-opos6uldev.dts         |  2 --
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/dts/imx6ul-opos6ul-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx6ul-opos6uldev-u-boot.dtsi

[...]

Quoted 2 lines

Is there still something preventing this patch to be applied ?

Best regards,

Quoted 4 lines

Best regards,
Stefano Babic

Signature · 4 lines
Sébastien Szymanski
Software engineer, Armadeus Systems
Tel: +33 (0)9 72 29 41 44
Fax: +33 (0)9 72 28 79 26