[PATCH v2] common: Kconfig: Add dependency for default variables strings

Michal Simek michal.simek at xilinx.com
Thu Aug 27 18:01:28 CEST 2020


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

Changes in v2:
- remove autoboot - reported by Tom

There are likely other Kconfig entries which should be fixed too.

---
 common/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig
index c58f08ba91bf..b1934b3a9c51 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.
-- 
2.28.0



More information about the U-Boot mailing list