All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] imx8m*_venice_defconfig: fix default bootcmd
@ 2022-09-08 16:11 Tim Harvey
  2022-09-13 17:32 ` Tim Harvey
  2022-09-19 14:59 ` Tom Rini
  0 siblings, 2 replies; 4+ messages in thread
From: Tim Harvey @ 2022-09-08 16:11 UTC (permalink / raw)
  To: u-boot; +Cc: Tom Rini, Tim Harvey

commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
had an unintended side effect of resulting in a bootcmd env var change
for boards like venice that did not have CONFIG_USE_BOOTCOMMAND defined
and relied on it being defaulted in include/config_distro_bootcmd.h.
Following that patch it instead got defaulted in tools/env/fw_env_private.h

Fix this by enabling CONFIG_USE_BOOTCOMMAND for venice.

Fixes: commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
 configs/imx8mm_venice_defconfig | 1 -
 configs/imx8mn_venice_defconfig | 1 -
 configs/imx8mp_venice_defconfig | 1 -
 3 files changed, 3 deletions(-)

diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig
index a2bd27ab5729..a72b9033d8a9 100644
--- a/configs/imx8mm_venice_defconfig
+++ b/configs/imx8mm_venice_defconfig
@@ -28,7 +28,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-# CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="gsc wd-disable"
 CONFIG_BOARD_LATE_INIT=y
diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig
index a4e54ff50cf1..821252ad600c 100644
--- a/configs/imx8mn_venice_defconfig
+++ b/configs/imx8mn_venice_defconfig
@@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-# CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="gsc wd-disable"
 CONFIG_BOARD_LATE_INIT=y
diff --git a/configs/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig
index d1a1bfa82acf..339e740349d4 100644
--- a/configs/imx8mp_venice_defconfig
+++ b/configs/imx8mp_venice_defconfig
@@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-# CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="gsc wd-disable"
 CONFIG_BOARD_LATE_INIT=y
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] imx8m*_venice_defconfig: fix default bootcmd
  2022-09-08 16:11 [PATCH] imx8m*_venice_defconfig: fix default bootcmd Tim Harvey
@ 2022-09-13 17:32 ` Tim Harvey
  2022-09-19 12:53   ` Tom Rini
  2022-09-19 14:59 ` Tom Rini
  1 sibling, 1 reply; 4+ messages in thread
From: Tim Harvey @ 2022-09-13 17:32 UTC (permalink / raw)
  To: u-boot, Fabio Estevam, Stefano Babic; +Cc: Tom Rini

On Thu, Sep 8, 2022 at 9:11 AM Tim Harvey <tharvey@gateworks.com> wrote:
>
> commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
> had an unintended side effect of resulting in a bootcmd env var change
> for boards like venice that did not have CONFIG_USE_BOOTCOMMAND defined
> and relied on it being defaulted in include/config_distro_bootcmd.h.
> Following that patch it instead got defaulted in tools/env/fw_env_private.h
>
> Fix this by enabling CONFIG_USE_BOOTCOMMAND for venice.
>
> Fixes: commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> ---
>  configs/imx8mm_venice_defconfig | 1 -
>  configs/imx8mn_venice_defconfig | 1 -
>  configs/imx8mp_venice_defconfig | 1 -
>  3 files changed, 3 deletions(-)
>
> diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig
> index a2bd27ab5729..a72b9033d8a9 100644
> --- a/configs/imx8mm_venice_defconfig
> +++ b/configs/imx8mm_venice_defconfig
> @@ -28,7 +28,6 @@ CONFIG_SPL_LOAD_FIT=y
>  # CONFIG_USE_SPL_FIT_GENERATOR is not set
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_SYSTEM_SETUP=y
> -# CONFIG_USE_BOOTCOMMAND is not set
>  CONFIG_USE_PREBOOT=y
>  CONFIG_PREBOOT="gsc wd-disable"
>  CONFIG_BOARD_LATE_INIT=y
> diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig
> index a4e54ff50cf1..821252ad600c 100644
> --- a/configs/imx8mn_venice_defconfig
> +++ b/configs/imx8mn_venice_defconfig
> @@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
>  # CONFIG_USE_SPL_FIT_GENERATOR is not set
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_SYSTEM_SETUP=y
> -# CONFIG_USE_BOOTCOMMAND is not set
>  CONFIG_USE_PREBOOT=y
>  CONFIG_PREBOOT="gsc wd-disable"
>  CONFIG_BOARD_LATE_INIT=y
> diff --git a/configs/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig
> index d1a1bfa82acf..339e740349d4 100644
> --- a/configs/imx8mp_venice_defconfig
> +++ b/configs/imx8mp_venice_defconfig
> @@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
>  # CONFIG_USE_SPL_FIT_GENERATOR is not set
>  CONFIG_OF_BOARD_SETUP=y
>  CONFIG_OF_SYSTEM_SETUP=y
> -# CONFIG_USE_BOOTCOMMAND is not set
>  CONFIG_USE_PREBOOT=y
>  CONFIG_PREBOOT="gsc wd-disable"
>  CONFIG_BOARD_LATE_INIT=y
> --
> 2.25.1
>

Stefano,

I probably needed to send this one to you as it is for imx8m board
defconfigs and has a Fixes tag that fixes a regression. With a pending
release in a few weeks, it would be nice to get fixes merged. I'm not
sure if this must go through your tree or could instead go through
Tom's tree.

Best Regards,

Tim

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] imx8m*_venice_defconfig: fix default bootcmd
  2022-09-13 17:32 ` Tim Harvey
@ 2022-09-19 12:53   ` Tom Rini
  0 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2022-09-19 12:53 UTC (permalink / raw)
  To: Tim Harvey; +Cc: u-boot, Fabio Estevam, Stefano Babic

[-- Attachment #1: Type: text/plain, Size: 2900 bytes --]

On Tue, Sep 13, 2022 at 10:32:19AM -0700, Tim Harvey wrote:
> On Thu, Sep 8, 2022 at 9:11 AM Tim Harvey <tharvey@gateworks.com> wrote:
> >
> > commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
> > had an unintended side effect of resulting in a bootcmd env var change
> > for boards like venice that did not have CONFIG_USE_BOOTCOMMAND defined
> > and relied on it being defaulted in include/config_distro_bootcmd.h.
> > Following that patch it instead got defaulted in tools/env/fw_env_private.h
> >
> > Fix this by enabling CONFIG_USE_BOOTCOMMAND for venice.
> >
> > Fixes: commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
> > Signed-off-by: Tim Harvey <tharvey@gateworks.com>
> > ---
> >  configs/imx8mm_venice_defconfig | 1 -
> >  configs/imx8mn_venice_defconfig | 1 -
> >  configs/imx8mp_venice_defconfig | 1 -
> >  3 files changed, 3 deletions(-)
> >
> > diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig
> > index a2bd27ab5729..a72b9033d8a9 100644
> > --- a/configs/imx8mm_venice_defconfig
> > +++ b/configs/imx8mm_venice_defconfig
> > @@ -28,7 +28,6 @@ CONFIG_SPL_LOAD_FIT=y
> >  # CONFIG_USE_SPL_FIT_GENERATOR is not set
> >  CONFIG_OF_BOARD_SETUP=y
> >  CONFIG_OF_SYSTEM_SETUP=y
> > -# CONFIG_USE_BOOTCOMMAND is not set
> >  CONFIG_USE_PREBOOT=y
> >  CONFIG_PREBOOT="gsc wd-disable"
> >  CONFIG_BOARD_LATE_INIT=y
> > diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig
> > index a4e54ff50cf1..821252ad600c 100644
> > --- a/configs/imx8mn_venice_defconfig
> > +++ b/configs/imx8mn_venice_defconfig
> > @@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
> >  # CONFIG_USE_SPL_FIT_GENERATOR is not set
> >  CONFIG_OF_BOARD_SETUP=y
> >  CONFIG_OF_SYSTEM_SETUP=y
> > -# CONFIG_USE_BOOTCOMMAND is not set
> >  CONFIG_USE_PREBOOT=y
> >  CONFIG_PREBOOT="gsc wd-disable"
> >  CONFIG_BOARD_LATE_INIT=y
> > diff --git a/configs/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig
> > index d1a1bfa82acf..339e740349d4 100644
> > --- a/configs/imx8mp_venice_defconfig
> > +++ b/configs/imx8mp_venice_defconfig
> > @@ -29,7 +29,6 @@ CONFIG_SPL_LOAD_FIT=y
> >  # CONFIG_USE_SPL_FIT_GENERATOR is not set
> >  CONFIG_OF_BOARD_SETUP=y
> >  CONFIG_OF_SYSTEM_SETUP=y
> > -# CONFIG_USE_BOOTCOMMAND is not set
> >  CONFIG_USE_PREBOOT=y
> >  CONFIG_PREBOOT="gsc wd-disable"
> >  CONFIG_BOARD_LATE_INIT=y
> > --
> > 2.25.1
> >
> 
> Stefano,
> 
> I probably needed to send this one to you as it is for imx8m board
> defconfigs and has a Fixes tag that fixes a regression. With a pending
> release in a few weeks, it would be nice to get fixes merged. I'm not
> sure if this must go through your tree or could instead go through
> Tom's tree.

As this applies cleanly on top of the current imx PR, and is a Fixes,
I'll take this directly.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] imx8m*_venice_defconfig: fix default bootcmd
  2022-09-08 16:11 [PATCH] imx8m*_venice_defconfig: fix default bootcmd Tim Harvey
  2022-09-13 17:32 ` Tim Harvey
@ 2022-09-19 14:59 ` Tom Rini
  1 sibling, 0 replies; 4+ messages in thread
From: Tom Rini @ 2022-09-19 14:59 UTC (permalink / raw)
  To: Tim Harvey; +Cc: u-boot

[-- Attachment #1: Type: text/plain, Size: 689 bytes --]

On Thu, Sep 08, 2022 at 09:11:13AM -0700, Tim Harvey wrote:

> commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
> had an unintended side effect of resulting in a bootcmd env var change
> for boards like venice that did not have CONFIG_USE_BOOTCOMMAND defined
> and relied on it being defaulted in include/config_distro_bootcmd.h.
> Following that patch it instead got defaulted in tools/env/fw_env_private.h
> 
> Fix this by enabling CONFIG_USE_BOOTCOMMAND for venice.
> 
> Fixes: commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig")
> Signed-off-by: Tim Harvey <tharvey@gateworks.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-19 15:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-08 16:11 [PATCH] imx8m*_venice_defconfig: fix default bootcmd Tim Harvey
2022-09-13 17:32 ` Tim Harvey
2022-09-19 12:53   ` Tom Rini
2022-09-19 14:59 ` Tom Rini

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.