summaryrefslogtreecommitdiff
path: root/common/Kconfig
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2020-09-29 10:48:14 +0100
committerTom Rini <trini@konsulko.com>2020-09-29 13:17:33 -0400
commit324d77998ed68aa3ac53bfb6d3dcfb958a79c6a9 (patch)
treec72278725c8a8bf501769837faef18ebfda7db2d /common/Kconfig
parentd44d46e9fafaae85b0ebbcdc53999537a199fa2f (diff)
downloadu-boot-324d77998ed68aa3ac53bfb6d3dcfb958a79c6a9.tar.gz
u-boot-324d77998ed68aa3ac53bfb6d3dcfb958a79c6a9.tar.bz2
u-boot-324d77998ed68aa3ac53bfb6d3dcfb958a79c6a9.zip
Define default CONFIG_PREBOOT with right config option
The 44758771ee commit removes CONFIG_PREBOOT but actually sets the USE_PREBOOT Kconfig option which isn't CONFIG_PREBOOT and is also a bool option which means we regress because 'usb start' isn't run when expected, it should also be run for devices that have USB storage because keyboards aren't the only thing we might need the USB bus for. Fixes: 44758771ee ("arm: move CONFIG_PREBOOT="usb start" to KConfig") Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Cc: Jonas Smedegaard <dr@jones.dk> Cc: Neil Armstrong <narmstrong@baylibre.com>
Diffstat (limited to 'common/Kconfig')
-rw-r--r--common/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Kconfig b/common/Kconfig
index b1934b3a9c..9c20a9738e 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -403,7 +403,6 @@ config BOOTCOMMAND
config USE_PREBOOT
bool "Enable preboot"
- default "usb start" if USB_KEYBOARD
help
When this option is enabled, the existence of the environment
variable "preboot" will be checked immediately before starting the
@@ -417,6 +416,7 @@ config USE_PREBOOT
config PREBOOT
string "preboot default value"
depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE
+ default "usb start" if USB_KEYBOARD || USB_STORAGE
default ""
help
This is the default of "preboot" environment variable.