| Message ID | 20221231162514.334303-1-festevam@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | imx7d-pico: Fix the name of the u-boot.dtsi file | expand |
On Sat, Dec 31, 2022 at 01:25:14PM -0300, Fabio Estevam wrote: > 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. > > Signed-off-by: Fabio Estevam <festevam@denx.de> > --- > 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.
On Sat, Dec 31, 2022 at 01:25:14PM -0300, Fabio Estevam wrote: > 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. > > Signed-off-by: Fabio Estevam <festevam@denx.de> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/imx7d-pico-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
similarity index 100%
rename from arch/arm/dts/imx7d-pico-u-boot.dtsi
rename to arch/arm/dts/imx7d-pico-pi-u-boot.dtsi
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. Signed-off-by: Fabio Estevam <festevam@denx.de> --- 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%)