diff mbox series

imx8mn-venice-u-boot: Fix broken boot

Message ID 20221003135924.385762-1-festevam@denx.de
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series imx8mn-venice-u-boot: Fix broken boot | expand

Commit Message

Fabio Estevam Oct. 3, 2022, 1:59 p.m. UTC
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 Tim,

Could you please test this patch?

It fixes boot regression on imx8mn-evk and imx8mn-beacon.

 arch/arm/dts/imx8mn-venice-u-boot.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Nazzareno Trimarchi Oct. 3, 2022, 2:01 p.m. UTC | #1
Hi

On Mon, Oct 3, 2022 at 3:59 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 Tim,
>
> Could you please test this patch?
>
> It fixes boot regression on imx8mn-evk and imx8mn-beacon.
>
>  arch/arm/dts/imx8mn-venice-u-boot.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> index 9fb3871452..9debf9675d 100644
> --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> @@ -20,6 +20,10 @@
>         u-boot,dm-spl;
>  };
>
> +&spba1 {
> +       u-boot,dm-spl;
> +};
> +
>  &clk {
>         u-boot,dm-spl;
>         u-boot,dm-pre-reloc;

Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>

I have seen a series already here I think
> --
> 2.25.1
>
Stefano Babic Oct. 21, 2022, 11:43 a.m. UTC | #2
> 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
Fabio Estevam Oct. 22, 2022, 12:17 p.m. UTC | #3
Hi Stefano,

On Fri, Oct 21, 2022 at 8:50 AM <sbabic@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>
> > Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
> Applied to u-boot-imx, master, thanks !

Thanks, but this one is already present in U-Boot 2022.10 final.

Tom applied it directly to avoid the boot regression.

It seems that the u-boot-imx base is not up to date.
diff mbox series

Patch

diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
index 9fb3871452..9debf9675d 100644
--- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
@@ -20,6 +20,10 @@ 
 	u-boot,dm-spl;
 };
 
+&spba1 {
+	u-boot,dm-spl;
+};
+
 &clk {
 	u-boot,dm-spl;
 	u-boot,dm-pre-reloc;