| Message ID | 20221003133921.372072-1-festevam@denx.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | imx8mn-ddr4-evk-u-boot: Fix broken boot | expand |
On Mon, Oct 3, 2022 at 3:39 PM Fabio Estevam <festevam@denx.de> wrote: > > When the imx8mm.dtsi file was pulled in from Linux, the UARTs > were moved into an spba sub-node which wasn't being included > in the SPL device tree. This meant the references to the UART > weren't being handled properly and when booting the system would > constantly reboot. Fix this by adding the spba node to the spl > device tree to restore normal booting. > > Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot > board. > > Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux") > Signed-off-by: Fabio Estevam <festevam@denx.de> > --- > Hi Tom and Stefano, > > I know today is release day. Could this one be applied directly? > > It fixes a boot regression. > > Thanks > > arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi > index 78773c198e..3a9ba8b8c9 100644 > --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi > +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi > @@ -26,6 +26,10 @@ > u-boot,dm-spl; > }; > > +&spba1 { > + u-boot,dm-spl; > +}; > + Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com> > &clk { > u-boot,dm-spl; > u-boot,dm-pre-reloc; > -- > 2.25.1 >
> When the imx8mm.dtsi file was pulled in from Linux, the UARTs > were moved into an spba sub-node which wasn't being included > in the SPL device tree. This meant the references to the UART > weren't being handled properly and when booting the system would > constantly reboot. Fix this by adding the spba node to the spl > device tree to restore normal booting. > Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot > board. > Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux") > Signed-off-by: Fabio Estevam <festevam@denx.de> > Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 78773c198e..3a9ba8b8c9 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -26,6 +26,10 @@ u-boot,dm-spl; }; +&spba1 { + u-boot,dm-spl; +}; + &clk { u-boot,dm-spl; u-boot,dm-pre-reloc;
When the imx8mm.dtsi file was pulled in from Linux, the UARTs were moved into an spba sub-node which wasn't being included in the SPL device tree. This meant the references to the UART weren't being handled properly and when booting the system would constantly reboot. Fix this by adding the spba node to the spl device tree to restore normal booting. Based on the patch from Adam Ford for the imx8mn-beacon-kit-u-boot board. Fixes: 4e5114daf9eb ("imx8mn: synchronise device tree with linux") Signed-off-by: Fabio Estevam <festevam@denx.de> --- Hi Tom and Stefano, I know today is release day. Could this one be applied directly? It fixes a boot regression. Thanks arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+)