diff mbox series

imx: ventana: correct splashimage load address

Message ID 20220117113146.652-1-andrey.zhizhikin@leica-geosystems.com
State Accepted
Commit 8c34cdc7358629b153fafd6bd4e27601d3ad508b
Delegated to: Stefano Babic
Headers show
Series imx: ventana: correct splashimage load address | expand

Commit Message

ZHIZHIKIN Andrey Jan. 17, 2022, 11:31 a.m. UTC 
Commit 72d81360aabd ("global: Convert CONFIG_LOADADDR to
CONFIG_SYS_LOADADDR") dropped the usage of LOADADDR and replaced it with
SYS_LOADADDR.

Use the correct macro in environment by replacing CONFIG_LOADADDR with
CONFIG_SYS_LOADADDR.

Fixes: d75ebf3482c3 ("imx: ventana: fix splash logo drawing")
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Cc: Tim Harvey <tharvey@gateworks.com>
---
 include/configs/gw_ventana.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: d71dbe657c3c22f50ecb3df133e5cdd884daae7d

Comments

Fabio Estevam Jan. 18, 2022, 11:51 a.m. UTC | #1 
Hi Andrey,

On Mon, Jan 17, 2022 at 8:32 AM Andrey Zhizhikin
<andrey.zhizhikin@leica-geosystems.com> wrote:
>
> Commit 72d81360aabd ("global: Convert CONFIG_LOADADDR to
> CONFIG_SYS_LOADADDR") dropped the usage of LOADADDR and replaced it with
> SYS_LOADADDR.
>
> Use the correct macro in environment by replacing CONFIG_LOADADDR with
> CONFIG_SYS_LOADADDR.
>
> Fixes: d75ebf3482c3 ("imx: ventana: fix splash logo drawing")
> Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
> Cc: Tim Harvey <tharvey@gateworks.com>

Thanks for the fix:

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Tim Harvey Jan. 18, 2022, 4:40 p.m. UTC | #2 
On Mon, Jan 17, 2022 at 3:32 AM Andrey Zhizhikin
<andrey.zhizhikin@leica-geosystems.com> wrote:
>
> Commit 72d81360aabd ("global: Convert CONFIG_LOADADDR to
> CONFIG_SYS_LOADADDR") dropped the usage of LOADADDR and replaced it with
> SYS_LOADADDR.
>
> Use the correct macro in environment by replacing CONFIG_LOADADDR with
> CONFIG_SYS_LOADADDR.
>
> Fixes: d75ebf3482c3 ("imx: ventana: fix splash logo drawing")
> Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
> Cc: Tim Harvey <tharvey@gateworks.com>
> ---
>  include/configs/gw_ventana.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> index 513b2d4679..acd495f234 100644
> --- a/include/configs/gw_ventana.h
> +++ b/include/configs/gw_ventana.h
> @@ -105,7 +105,7 @@
>
>  #define CONFIG_EXTRA_ENV_SETTINGS_COMMON \
>         "splashpos=m,m\0" \
> -       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
> +       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
>         "usb_pgood_delay=2000\0" \
>         "console=ttymxc1\0" \
>         "bootdevs=usb mmc sata flash\0" \
>
> base-commit: d71dbe657c3c22f50ecb3df133e5cdd884daae7d
> --
> 2.25.1
>

Acked-By: Tim Harvey <tharvey@gateworks.com>

Thanks,

Tim
Tim Harvey Jan. 27, 2022, 11:19 p.m. UTC | #3 
On Tue, Jan 18, 2022 at 8:40 AM Tim Harvey <tharvey@gateworks.com> wrote:
>
> On Mon, Jan 17, 2022 at 3:32 AM Andrey Zhizhikin
> <andrey.zhizhikin@leica-geosystems.com> wrote:
> >
> > Commit 72d81360aabd ("global: Convert CONFIG_LOADADDR to
> > CONFIG_SYS_LOADADDR") dropped the usage of LOADADDR and replaced it with
> > SYS_LOADADDR.
> >
> > Use the correct macro in environment by replacing CONFIG_LOADADDR with
> > CONFIG_SYS_LOADADDR.
> >
> > Fixes: d75ebf3482c3 ("imx: ventana: fix splash logo drawing")
> > Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
> > Cc: Tim Harvey <tharvey@gateworks.com>
> > ---
> >  include/configs/gw_ventana.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> > index 513b2d4679..acd495f234 100644
> > --- a/include/configs/gw_ventana.h
> > +++ b/include/configs/gw_ventana.h
> > @@ -105,7 +105,7 @@
> >
> >  #define CONFIG_EXTRA_ENV_SETTINGS_COMMON \
> >         "splashpos=m,m\0" \
> > -       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
> > +       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> >         "usb_pgood_delay=2000\0" \
> >         "console=ttymxc1\0" \
> >         "bootdevs=usb mmc sata flash\0" \
> >
> > base-commit: d71dbe657c3c22f50ecb3df133e5cdd884daae7d
> > --
> > 2.25.1
> >
>
> Acked-By: Tim Harvey <tharvey@gateworks.com>
>

Andrey,

While this does restore the custom logo on the gwventana boards there
is now a default U-Boot logo in the top left corner. I assume this is
some new addition... how do I disable the U-Boot logo?

Best Regards,

Tim
ZHIZHIKIN Andrey Jan. 28, 2022, 6:31 p.m. UTC | #4 
Hello Tim,

> -----Original Message-----
> From: Tim Harvey <tharvey@gateworks.com>
> Sent: Friday, January 28, 2022 12:20 AM
> To: ZHIZHIKIN Andrey <andrey.zhizhikin@leica-geosystems.com>
> Cc: u-boot <u-boot@lists.denx.de>
> Subject: Re: [PATCH] imx: ventana: correct splashimage load address
> 
> 
> On Tue, Jan 18, 2022 at 8:40 AM Tim Harvey <tharvey@gateworks.com> wrote:
> >
> > On Mon, Jan 17, 2022 at 3:32 AM Andrey Zhizhikin
> > <andrey.zhizhikin@leica-geosystems.com> wrote:
> > >
> > > Commit 72d81360aabd ("global: Convert CONFIG_LOADADDR to
> > > CONFIG_SYS_LOADADDR") dropped the usage of LOADADDR and replaced it with
> > > SYS_LOADADDR.
> > >
> > > Use the correct macro in environment by replacing CONFIG_LOADADDR with
> > > CONFIG_SYS_LOADADDR.
> > >
> > > Fixes: d75ebf3482c3 ("imx: ventana: fix splash logo drawing")
> > > Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
> > > Cc: Tim Harvey <tharvey@gateworks.com>
> > > ---
> > >  include/configs/gw_ventana.h | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
> > > index 513b2d4679..acd495f234 100644
> > > --- a/include/configs/gw_ventana.h
> > > +++ b/include/configs/gw_ventana.h
> > > @@ -105,7 +105,7 @@
> > >
> > >  #define CONFIG_EXTRA_ENV_SETTINGS_COMMON \
> > >         "splashpos=m,m\0" \
> > > -       "splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
> > > +       "splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> > >         "usb_pgood_delay=2000\0" \
> > >         "console=ttymxc1\0" \
> > >         "bootdevs=usb mmc sata flash\0" \
> > >
> > > base-commit: d71dbe657c3c22f50ecb3df133e5cdd884daae7d
> > > --
> > > 2.25.1
> > >
> >
> > Acked-By: Tim Harvey <tharvey@gateworks.com>
> >
> 
> Andrey,
> 
> While this does restore the custom logo on the gwventana boards there
> is now a default U-Boot logo in the top left corner. I assume this is
> some new addition... how do I disable the U-Boot logo?

THB, this I do not know. I stumbled upon the incorrect variable while
I was working on imx8mq-evk, and thought that this patch would be
beneficial for gwventana since this was the only place where the old
variable name was used.

I guess the question of suppression of default U-Boot logo is for a
bigger audience here.

> 
> Best Regards,
> 
> Tim

-- andrey
Stefano Babic Feb. 5, 2022, 4:41 p.m. UTC | #5 
> Commit 72d81360aabd ("global: Convert CONFIG_LOADADDR to
> CONFIG_SYS_LOADADDR") dropped the usage of LOADADDR and replaced it with
> SYS_LOADADDR.
> Use the correct macro in environment by replacing CONFIG_LOADADDR with
> CONFIG_SYS_LOADADDR.
> Fixes: d75ebf3482c3 ("imx: ventana: fix splash logo drawing")
> Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
> Cc: Tim Harvey <tharvey@gateworks.com>
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
> Acked-By: Tim Harvey <tharvey@gateworks.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 513b2d4679..acd495f234 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -105,7 +105,7 @@ 
 
 #define CONFIG_EXTRA_ENV_SETTINGS_COMMON \
 	"splashpos=m,m\0" \
-	"splashimage=" __stringify(CONFIG_LOADADDR) "\0" \
+	"splashimage=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
 	"usb_pgood_delay=2000\0" \
 	"console=ttymxc1\0" \
 	"bootdevs=usb mmc sata flash\0" \