summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2020-08-27 18:01:28 +0200
committerTom Rini <trini@konsulko.com>2020-09-11 17:13:55 -0400
commit91b735d11f95ecf608a95a255281c36dcc7e37a4 (patch)
treeb867885fa4c7cbb6e72d8fd05d5e0328b739f5b8 /common
parent9250d0bad5637233a24a0c4b583100ad1be63316 (diff)
common: Kconfig: Add dependency for default variables strings
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>
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/Kconfig b/common/Kconfig
index c58f08ba91..b1934b3a9c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -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.