[U-Boot] imx: 8qxp_mek: fix fdt_file and console
diff mbox series

Message ID 20190415121352.10138-1-peng.fan@nxp.com
State Accepted
Commit 3b9ac5415084eadbd34a9d4d94e23d9935e73bd4
Delegated to: Stefano Babic
Headers show
Series
  • [U-Boot] imx: 8qxp_mek: fix fdt_file and console
Related show

Commit Message

Peng Fan April 15, 2019, noon UTC
Fix fdt_file and console to boot upstream Linux Kernel.

Upstream linux use imx8qxp-mek.dtb, and pass lpuart32 to earlycon
will not work for i.MX8QXP, only need to pass earlycon,
check drivers/tty/serial/earlycon.c,
" /* Just 'earlycon' is a valid param for devicetree and ACPI SPCR. */ "

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 include/configs/imx8qxp_mek.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Fabio Estevam April 15, 2019, 1:31 p.m. UTC | #1
On Mon, Apr 15, 2019 at 9:01 AM Peng Fan <peng.fan@nxp.com> wrote:
>
> Fix fdt_file and console to boot upstream Linux Kernel.
>
> Upstream linux use imx8qxp-mek.dtb, and pass lpuart32 to earlycon
> will not work for i.MX8QXP, only need to pass earlycon,
> check drivers/tty/serial/earlycon.c,
> " /* Just 'earlycon' is a valid param for devicetree and ACPI SPCR. */ "
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Marcel Ziswiler April 26, 2019, 6:42 p.m. UTC | #2
Hi Peng and Stefano

On Mon, 2019-04-15 at 12:00 +0000, Peng Fan wrote:
> Fix fdt_file and console to boot upstream Linux Kernel.
> 
> Upstream linux use imx8qxp-mek.dtb, and pass lpuart32 to earlycon
> will not work for i.MX8QXP, only need to pass earlycon,
> check drivers/tty/serial/earlycon.c,
> " /* Just 'earlycon' is a valid param for devicetree and ACPI SPCR.
> */ "
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  include/configs/imx8qxp_mek.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/configs/imx8qxp_mek.h
> b/include/configs/imx8qxp_mek.h
> index 1cff18e05e..5c83505ff0 100644
> --- a/include/configs/imx8qxp_mek.h
> +++ b/include/configs/imx8qxp_mek.h
> @@ -65,11 +65,11 @@
>  	"script=boot.scr\0" \
>  	"image=Image\0" \
>  	"panel=NULL\0" \
> -	"console=ttyLP0,${baudrate}
> earlycon=lpuart32,0x5a060000,${baudrate}\0" \
> +	"console=ttyLP0,${baudrate} earlycon\0" \

I don't think using ${baudrate} in console= like that actually works.
At least for me this lead to the following:

root@colibri-imx8qxp:~# cat /proc/cmdline 
console=ttyLP3,${baudrate} earlycon,115200 root=PARTUUID=5e6e3605-02
rootwait mmcautodetect=yes

E.g. ${baudrate} is never actually evaluated unless one does an
explicit assignment aka setenv something something.

>  	"fdt_addr=0x83000000\0"			\
>  	"fdt_high=0xffffffffffffffff\0"		\
>  	"boot_fdt=try\0" \
> -	"fdt_file=fsl-imx8qxp-mek.dtb\0" \
> +	"fdt_file=imx8qxp-mek.dtb\0" \
>  	"initrd_addr=0x83800000\0"		\
>  	"initrd_high=0xffffffffffffffff\0" \
>  	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> -- 
> 2.16.4
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot

Cheers

Marcel
Peng Fan April 27, 2019, 12:11 a.m. UTC | #3
> Subject: [REGRESSION] [PATCH] imx: 8qxp_mek: fix fdt_file and console
> 
> Hi Peng and Stefano
> 
> On Mon, 2019-04-15 at 12:00 +0000, Peng Fan wrote:
> > Fix fdt_file and console to boot upstream Linux Kernel.
> >
> > Upstream linux use imx8qxp-mek.dtb, and pass lpuart32 to earlycon will
> > not work for i.MX8QXP, only need to pass earlycon, check
> > drivers/tty/serial/earlycon.c, " /* Just 'earlycon' is a valid param
> > for devicetree and ACPI SPCR.
> > */ "
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  include/configs/imx8qxp_mek.h | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/include/configs/imx8qxp_mek.h
> > b/include/configs/imx8qxp_mek.h index 1cff18e05e..5c83505ff0 100644
> > --- a/include/configs/imx8qxp_mek.h
> > +++ b/include/configs/imx8qxp_mek.h
> > @@ -65,11 +65,11 @@
> >  	"script=boot.scr\0" \
> >  	"image=Image\0" \
> >  	"panel=NULL\0" \
> > -	"console=ttyLP0,${baudrate}
> > earlycon=lpuart32,0x5a060000,${baudrate}\0" \
> > +	"console=ttyLP0,${baudrate} earlycon\0" \
> 
> I don't think using ${baudrate} in console= like that actually works.
> At least for me this lead to the following:

You mean include/env_default.h this not work?

Regards,
Peng.

> 
> root@colibri-imx8qxp:~# cat /proc/cmdline console=ttyLP3,${baudrate}
> earlycon,115200 root=PARTUUID=5e6e3605-02 rootwait
> mmcautodetect=yes
> 
> E.g. ${baudrate} is never actually evaluated unless one does an explicit
> assignment aka setenv something something.
> 
> >  	"fdt_addr=0x83000000\0"			\
> >  	"fdt_high=0xffffffffffffffff\0"		\
> >  	"boot_fdt=try\0" \
> > -	"fdt_file=fsl-imx8qxp-mek.dtb\0" \
> > +	"fdt_file=imx8qxp-mek.dtb\0" \
> >  	"initrd_addr=0x83800000\0"		\
> >  	"initrd_high=0xffffffffffffffff\0" \
> >  	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
> > --
> > 2.16.4
> >
> > _______________________________________________
> > U-Boot mailing list
> > U-Boot@lists.denx.de
> > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
> >
> s.denx.de%2Flistinfo%2Fu-boot&amp;data=02%7C01%7Cpeng.fan%40nxp.co
> m%7C
> >
> 0e6a5db6025549efd94708d6ca76ec09%7C686ea1d3bc2b4c6fa92cd99c5c30
> 1635%7C
> >
> 0%7C0%7C636919009450074747&amp;sdata=g8pl8UzcwoFAlfZAHDOeBb1s4
> zcH%2BzJ
> > qFkGukoHAfnQ%3D&amp;reserved=0
> 
> Cheers
> 
> Marcel

Patch
diff mbox series

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 1cff18e05e..5c83505ff0 100644
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -65,11 +65,11 @@ 
 	"script=boot.scr\0" \
 	"image=Image\0" \
 	"panel=NULL\0" \
-	"console=ttyLP0,${baudrate} earlycon=lpuart32,0x5a060000,${baudrate}\0" \
+	"console=ttyLP0,${baudrate} earlycon\0" \
 	"fdt_addr=0x83000000\0"			\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"boot_fdt=try\0" \
-	"fdt_file=fsl-imx8qxp-mek.dtb\0" \
+	"fdt_file=imx8qxp-mek.dtb\0" \
 	"initrd_addr=0x83800000\0"		\
 	"initrd_high=0xffffffffffffffff\0" \
 	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \