Skip to contentSkip to conversation

imx7d-pico: Fix the name of the u-boot.dtsi file

PATCH In review Fabio Estevam 2 participants 3 messages Dec 31, 2022 – Jan 6, 2023

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

PATCH 1/1 imx7d-pico: Fix the name of the u-boot.dtsi file

Since commit 2f96d4dd95f8 ("imx7s/d: synchronise device trees with linux") the imx7d-pico board no longer boots.

The reason is that prior to the above commit there was an explicit inclusion of arch/arm/dts/imx7d-pico-u-boot.dtsi inside imx7d-pico.dtsi.

After the syncing with the Linux upstream dtsi, this u-boot.dtsi inclusion is gone and the board fails to boot.

U-Boot uses the imx7d-pico-pi.dtb file, so rename the u-boot.dtsi to imx7d-pico-pi-u-boot.dtsi which gets included automatically by U-Boot standard make logic and makes the board boot again.

---
Hi Tom and Stefano,

Please apply this one for U-Boot 2023.01 to fix a boot regression.

Thanks

 .../arm/dts/{imx7d-pico-u-boot.dtsi => imx7d-pico-pi-u-boot.dtsi} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/dts/{imx7d-pico-u-boot.dtsi => imx7d-pico-pi-u-boot.dtsi} (100%)
arch/arm/dts/imx7d-pico-pi-u-boot.dtsi renamed from arch/arm/dts/imx7d-pico-u-boot.dtsi +0 -0
similarity index 100%
rename from arch/arm/dts/imx7d-pico-u-boot.dtsi
rename to arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
Signature · 1 line
2.25.1
#1 lore raw
Quoted 13 lines · Fabio Estevam

Since commit 2f96d4dd95f8 ("imx7s/d: synchronise device trees with linux") the imx7d-pico board no longer boots.

The reason is that prior to the above commit there was an explicit inclusion of arch/arm/dts/imx7d-pico-u-boot.dtsi inside imx7d-pico.dtsi.

After the syncing with the Linux upstream dtsi, this u-boot.dtsi inclusion is gone and the board fails to boot.

U-Boot uses the imx7d-pico-pi.dtb file, so rename the u-boot.dtsi to imx7d-pico-pi-u-boot.dtsi which gets included automatically by U-Boot standard make logic and makes the board boot again.

Quoted 5 lines

---
Hi Tom and Stefano,

Please apply this one for U-Boot 2023.01 to fix a boot regression.

In my bundle to get before the release.

Signature · 1 line
Tom
#2 lore raw
In reply to Fabio Estevam
Quoted 6 lines · Fabio Estevam

Since commit 2f96d4dd95f8 ("imx7s/d: synchronise device trees with linux") the imx7d-pico board no longer boots.

The reason is that prior to the above commit there was an explicit inclusion of arch/arm/dts/imx7d-pico-u-boot.dtsi inside imx7d-pico.dtsi.

Quoted 8 lines

After the syncing with the Linux upstream dtsi, this u-boot.dtsi inclusion is gone and the board fails to boot.

U-Boot uses the imx7d-pico-pi.dtb file, so rename the u-boot.dtsi to imx7d-pico-pi-u-boot.dtsi which gets included automatically by U-Boot standard make logic and makes the board boot again.

Applied to u-boot/master, thanks!

Signature · 1 line
Tom