Skip to contentSkip to conversation

arm: dts: am33xx: introduce 'am33xx-u-boot.dtsi'

PATCH New Hannes Schmelzer 4 participants 5 messages Feb 6, 2019 – Feb 8, 2019 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 arm: dts: am33xx: introduce 'am33xx-u-boot.dtsi'

commit fdce9d35dc36 ("arm: dts: am33xx: Sync dts with Linux 4.20.0") did remove the "u-boot,dm-spl" flag from the 'ocp' bus which was introduced with
commit 19aa4ac09db9 ("dts: am33xx: add u-boot, dm-spl to ocp bus")

Due to this all boards having CONFIG_SPL_OF_CONTROL enabled are broken because they cannot bind/probe the boot-media interface during SPL stage.

This commit introduces the 'am33xx-u-boot.dtsi' which is included with the auto include mechanism. The am33xx-u-boot-dtsi adds the important "u-boot,dm-pre-reloc" to the 'ocp bus' (the root bus of almost all peripherals, at least the bootable ones).

The peripherials (mmc, spi, ...) needed during SPL stage need to be equipped with the 'u-boot,dm-pre-reloc' in their responsible dts file.

---

Changes in v2:
- use u-boot,dm-pre-reloc instead u-boot,dm-spl
- add am33xx-u-boot.dtsi instead modifying the am33xx.dtsi

 arch/arm/dts/am33xx-u-boot.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 arch/arm/dts/am33xx-u-boot.dtsi
arch/arm/dts/am33xx-u-boot.dtsi new file +11 -0
new file mode 100644
index 0000000..78f5e2c
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 B&R Industrial Automation GmbH -
+ * https://www.br-automation.com/
+ */
+
+/ {
+	ocp {
+		u-boot,dm-pre-reloc;
+	};
+};
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 1/1 arm: dts: am33xx: introduce 'am33xx-u-boot.dtsi'

Hi Hannes,

Quoted 9 lines · Hannes Schmelzer

commit fdce9d35dc36 ("arm: dts: am33xx: Sync dts with Linux 4.20.0") did remove the "u-boot,dm-spl" flag from the 'ocp' bus which was introduced with
commit 19aa4ac09db9 ("dts: am33xx: add u-boot, dm-spl to ocp bus")

Due to this all boards having CONFIG_SPL_OF_CONTROL enabled are broken because they cannot bind/probe the boot-media interface during SPL stage.

Not all boards were broken, only those not having set that property in their proper -u-boot.dtsi or dts file (like am335x-pdu001-u-boot.dtsi).

Quoted 5 lines

This commit introduces the 'am33xx-u-boot.dtsi' which is included with the auto include mechanism. The am33xx-u-boot-dtsi adds the important "u-boot,dm-pre-reloc" to the 'ocp bus' (the root bus of almost all peripherals, at least the bootable ones).

If the new am33xx-u-boot.dtsi file gets include automatically then setting the same property in the board specific dts/dtsi file is redundant. Hence please remove the property from those files (like from am335x-pdu001-u-boot.dtsi) and add those modified files to your patch. Thus we have one single patch fixing this issue. Many thanks!

retards Felix

Quoted 33 lines

The peripherials (mmc, spi, ...) needed during SPL stage need to be equipped with the 'u-boot,dm-pre-reloc' in their responsible dts file.

---

Changes in v2:
- use u-boot,dm-pre-reloc instead u-boot,dm-spl
- add am33xx-u-boot.dtsi instead modifying the am33xx.dtsi

 arch/arm/dts/am33xx-u-boot.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 arch/arm/dts/am33xx-u-boot.dtsi
arch/arm/dts/am33xx-u-boot.dtsi new file +11 -0
new file mode 100644
index 0000000..78f5e2c
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2019 B&R Industrial Automation GmbH -
+ * https://www.br-automation.com/
+ */
+
+/ {
+	ocp {
+		u-boot,dm-pre-reloc;
+	};
+};
#2 lore raw

PATCH v2 1/1 arm: dts: am33xx: introduce 'am33xx-u-boot.dtsi'

Quoted 1 line · Felix Brack

Hi Hannes,

Hi Felix,

Quoted 6 lines · Hannes Schmelzer
Quoted 5 lines

commit fdce9d35dc36 ("arm: dts: am33xx: Sync dts with Linux 4.20.0") did remove the "u-boot,dm-spl" flag from the 'ocp' bus which was introduced with
commit 19aa4ac09db9 ("dts: am33xx: add u-boot, dm-spl to ocp bus")

Quoted 6 lines
Quoted 4 lines

Due to this all boards having CONFIG_SPL_OF_CONTROL enabled are broken because they cannot bind/probe the boot-media interface during SPL stage.

Not all boards were broken, only those not having set that property in their proper -u-boot.dtsi or dts file (like am335x-pdu001-u-boot.dtsi).

true.

Quoted 5 lines
Quoted 5 lines

This commit introduces the 'am33xx-u-boot.dtsi' which is included with the auto include mechanism. The am33xx-u-boot-dtsi adds the important "u-boot,dm-pre-reloc" to the 'ocp bus' (the root bus of almost all peripherals, at least the bootable ones).

Quoted 7 lines

If the new am33xx-u-boot.dtsi file gets include automatically then setting the same property in the board specific dts/dtsi file is redundant. Hence please remove the property from those files (like from am335x-pdu001-u-boot.dtsi) and add those modified files to your patch. Thus we have one single patch fixing this issue. Many thanks!

retards Felix

Nope.
If i understood the mechanism correctly the mechanism searches this way:

   <dts>-u-boot.dtsi where <dts> is the base name of the .dts file <CONFIG_SYS_SOC>-u-boot.dtsi <CONFIG_SYS_CPU>-u-boot.dtsi <CONFIG_SYS_VENDOR>-u-boot.dtsi
   u-boot.dtsi

and stops after the first  match.
In your case: *am335x-pdu001*-u-boot.dtsi

Have a look, to: tools/binman/README

So i still think, that my patch is on the right track.

Quoted 38 lines
Quoted 24 lines

The peripherials (mmc, spi, ...) needed during SPL stage need to be equipped with the 'u-boot,dm-pre-reloc' in their responsible dts file.

---

Changes in v2:
- use u-boot,dm-pre-reloc instead u-boot,dm-spl
- add am33xx-u-boot.dtsi instead modifying the am33xx.dtsi

  arch/arm/dts/am33xx-u-boot.dtsi | 11 +++++++++++
  1 file changed, 11 insertions(+)

create mode 100644 arch/arm/dts/am33xx-u-boot.dtsi

arch/arm/dts/am33xx-u-boot.dtsi new file +1 -0
new file mode 100644
index 0000000..78f5e2c
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+

arch/arm/dts/am33xx-u-boot.dtsi line 11

Quoted 10 lines
arch/arm/dts/am33xx-u-boot.dtsi new file +10 -0
+/*
+ * Copyright (C) 2019 B&R Industrial Automation GmbH -
+ * https://www.br-automation.com/
+ */
+
+/ {
+	ocp {
+		u-boot,dm-pre-reloc;
+	};
+};

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

#3 lore raw

PATCH v2 1/1 arm: dts: am33xx: introduce 'am33xx-u-boot.dtsi'

Hi Hannes,

Quoted 33 lines · Hannes Schmelzer
Quoted 1 line · Felix Brack

Hi Hannes,

Hi Felix,

Quoted 6 lines · Hannes Schmelzer
Quoted 5 lines

commit fdce9d35dc36 ("arm: dts: am33xx: Sync dts with Linux 4.20.0") did remove the "u-boot,dm-spl" flag from the 'ocp' bus which was introduced with
commit 19aa4ac09db9 ("dts: am33xx: add u-boot, dm-spl to ocp bus")

Quoted 6 lines
Quoted 4 lines

Due to this all boards having CONFIG_SPL_OF_CONTROL enabled are broken because they cannot bind/probe the boot-media interface during SPL stage.

Not all boards were broken, only those not having set that property in their proper -u-boot.dtsi or dts file (like am335x-pdu001-u-boot.dtsi).

true.

Quoted 5 lines
Quoted 5 lines

This commit introduces the 'am33xx-u-boot.dtsi' which is included with the auto include mechanism. The am33xx-u-boot-dtsi adds the important "u-boot,dm-pre-reloc" to the 'ocp bus' (the root bus of almost all peripherals, at least the bootable ones).

Quoted 7 lines

If the new am33xx-u-boot.dtsi file gets include automatically then setting the same property in the board specific dts/dtsi file is redundant. Hence please remove the property from those files (like from am335x-pdu001-u-boot.dtsi) and add those modified files to your patch. Thus we have one single patch fixing this issue. Many thanks!

retards Felix

Nope.
If i understood the mechanism correctly the mechanism searches this way:

Quoted 7 lines

   <dts>-u-boot.dtsi where <dts> is the base name of the .dts file <CONFIG_SYS_SOC>-u-boot.dtsi <CONFIG_SYS_CPU>-u-boot.dtsi <CONFIG_SYS_VENDOR>-u-boot.dtsi
   u-boot.dtsi

and stops after the first  match.

Agreed, you are absolutely right. I should have remembered that since I already had some problems with this mechanism ;-).

Quoted 2 lines

In your case: *am335x-pdu001*-u-boot.dtsi

I have decided to put the U-Boot specific properties into the above mentioned file to make sure I can keep the exact same DTS file in U-Boot and Linux, which simplifies the synchronization.

Quoted 42 lines

Have a look, to: tools/binman/README

So i still think, that my patch is on the right track.

Quoted 37 lines
Quoted 23 lines

The peripherials (mmc, spi, ...) needed during SPL stage need to be equipped with the 'u-boot,dm-pre-reloc' in their responsible dts file.

---

Changes in v2:
- use u-boot,dm-pre-reloc instead u-boot,dm-spl
- add am33xx-u-boot.dtsi instead modifying the am33xx.dtsi

 arch/arm/dts/am33xx-u-boot.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 arch/arm/dts/am33xx-u-boot.dtsi
arch/arm/dts/am33xx-u-boot.dtsi new file +1 -0
new file mode 100644
index 0000000..78f5e2c
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+

arch/arm/dts/am33xx-u-boot.dtsi line 11

Quoted 10 lines
arch/arm/dts/am33xx-u-boot.dtsi new file +10 -0
+/*
+ * Copyright (C) 2019 B&R Industrial Automation GmbH -
+ * https://www.br-automation.com/
+ */
+
+/ {
+	ocp {
+		u-boot,dm-pre-reloc;
+	};
+};

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

regards Felix

#4 lore raw

PATCH v2 1/1 arm: dts: am33xx: introduce 'am33xx-u-boot.dtsi'

In reply to Hannes Schmelzer
Quoted 14 lines · Hannes Schmelzer

commit fdce9d35dc36 ("arm: dts: am33xx: Sync dts with Linux 4.20.0") did remove the "u-boot,dm-spl" flag from the 'ocp' bus which was introduced with
commit 19aa4ac09db9 ("dts: am33xx: add u-boot, dm-spl to ocp bus")

Due to this all boards having CONFIG_SPL_OF_CONTROL enabled are broken because they cannot bind/probe the boot-media interface during SPL stage.

This commit introduces the 'am33xx-u-boot.dtsi' which is included with the auto include mechanism. The am33xx-u-boot-dtsi adds the important "u-boot,dm-pre-reloc" to the 'ocp bus' (the root bus of almost all peripherals, at least the bootable ones).

Quoted 5 lines

The peripherials (mmc, spi, ...) needed during SPL stage need to be equipped with the 'u-boot,dm-pre-reloc' in their responsible dts file.

Applied to u-boot/master, thanks!

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/20190207/860503b1/attachment.sig>