| Message ID | 2c7c674f330bf06aa4a6e266005d7e2058254dd5.1597217302.git.michal.simek@xilinx.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | common: Kconfig: Add dependency for default variables strings | expand |
On Wed, Aug 12, 2020 at 09:28:24AM +0200, Michal Simek wrote: > Kconfig provides several config options for setting up default variables > but these are unused when variables are passed to U-Boot via file. > That's why cover this dependency in Kconfig. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > There are likely other Kconfig entries which should be fixed too. > > --- > common/Kconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/common/Kconfig b/common/Kconfig > index 62d78c5bd739..b7d5a8f28cf8 100644 > --- a/common/Kconfig > +++ b/common/Kconfig > @@ -355,7 +355,7 @@ endmenu > config BOOTDELAY > int "delay in seconds before automatically booting" > default 2 > - depends on AUTOBOOT > + depends on AUTOBOOT && !USE_DEFAULT_ENV_FILE > help > Delay before automatically running bootcmd; > set to 0 to autoboot with no delay, but you can stop it by key input. The rest are fine but BOOTDELAY is used directly in the code outside of just the environment.
diff --git a/common/Kconfig b/common/Kconfig index 62d78c5bd739..b7d5a8f28cf8 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -355,7 +355,7 @@ endmenu config BOOTDELAY int "delay in seconds before automatically booting" default 2 - depends on AUTOBOOT + depends on AUTOBOOT && !USE_DEFAULT_ENV_FILE help Delay before automatically running bootcmd; set to 0 to autoboot with no delay, but you can stop it by key input. @@ -378,7 +378,7 @@ config USE_BOOTARGS config BOOTARGS string "Boot arguments" - depends on USE_BOOTARGS + depends on USE_BOOTARGS && !USE_DEFAULT_ENV_FILE help This can be used to pass arguments to the bootm command. The value of CONFIG_BOOTARGS goes into the environment value "bootargs". Note that @@ -395,7 +395,7 @@ config USE_BOOTCOMMAND config BOOTCOMMAND string "bootcmd value" - depends on USE_BOOTCOMMAND + depends on USE_BOOTCOMMAND && !USE_DEFAULT_ENV_FILE default "run distro_bootcmd" if DISTRO_DEFAULTS help This is the string of commands that will be used as bootcmd and if @@ -416,7 +416,7 @@ config USE_PREBOOT config PREBOOT string "preboot default value" - depends on USE_PREBOOT + depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE default "" help This is the default of "preboot" environment variable.
Kconfig provides several config options for setting up default variables but these are unused when variables are passed to U-Boot via file. That's why cover this dependency in Kconfig. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- There are likely other Kconfig entries which should be fixed too. --- common/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)