[PATCH 01/17] Convert CONFIG_FSL_FIXED_MMC_LOCATION et al to Kconfig

[Tim Harvey]

On Fri, Jul 22, 2022 at 12:06 PM Tom Rini <trini at konsulko.com> wrote:
>
> On Fri, Jul 22, 2022 at 11:01:52AM -0700, Tim Harvey wrote:
> > On Mon, Jun 20, 2022 at 5:08 AM Tom Rini <trini at konsulko.com> wrote:
> > >
> > > This converts the following to Kconfig:
> > >    CONFIG_FSL_FIXED_MMC_LOCATION
> > >    CONFIG_ESDHC_HC_BLK_ADDR
> > >
> > > Signed-off-by: Tom Rini <trini at konsulko.com>
> [snip]
> > Tom,
> >
> > I'm not sure this patch had the intended results. I just noticed that
> > default bootcmd was changed due to this for the the imx8m*venice
> > boards I maintain.
> >
> > How did you go about generating this? In my case
> > CONFIG_USE_BOOTCOMMAND is not set and prior to this patch was getting
> > defaulted in include/config_distro_bootcmd.h but now that is removed
> > and its getting set in tools/env/fw_env_private.h to something
> > different.
> >
> > To fix this, I'll have to submit a patch that does the following for
> > configs/imx8m*_venice_defconfig
> > +CONFIG_USE_BOOTCOMMAND=y
> > +CONFIG_BOOTCOMMAND="run distro_bootcmd"
> >
> > I figured it was worth mentioning and asking for others that run into this.
>
> It's this commit, specifically?  Looking at u-boot-initial-env (and
> disabling LTO for the moment), I don't see bootcmd set before nor after.
> I could see this being a merge related problem or similar from
> 970bf8603b877e2b66170290f751f9c23c120838 where I finished moving
> everyone that was in-tree at the time that should have been setting
> CONFIG_USE_BOOTCOMMAND and then CONFIG_BOOTCOMMAND (if not using the
> default) leading to this kind of problem.
>

Tom,

I apologize... not sure how I ended up replying to the wrong patch.

Indeed it is commit 970bf8603b87 ("Convert CONFIG_USE_BOOTCOMMAND et
al to Kconfig") that I was referring to.

It looks like any board that specifically did not define
CONFIG_USE_BOOTCOMMAND was likely affected and if I simply remove '#
CONFIG_USE_BOOTCOMMAND is not set' from my defconfigs it fixes it.

This is what I was going to submit but if the above assumption is
correct there would be a lot of other boards affected.

    imx8m*_venice_defconfig: fix default bootcmd

    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 at gateworks.com>

diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig
index 0165a4e5df08..c0fff026fbbc 100644
--- a/configs/imx8mm_venice_defconfig
+++ b/configs/imx8mm_venice_defconfig
@@ -27,7 +27,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 63a654973710..4bbf9ded74ad 100644
--- a/configs/imx8mn_venice_defconfig
+++ b/configs/imx8mn_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/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig
index 6758cd251e60..398875ae323a 100644
--- a/configs/imx8mp_venice_defconfig
+++ b/configs/imx8mp_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

Best Regards,

Tim