summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-09-29 13:24:50 -0400
committerTom Rini <trini@konsulko.com>2020-09-29 13:24:50 -0400
commit421ebb713b8ede345a4aad0e95fbd6518ac6800d (patch)
treee4eeb9199ff2c3753af6d44a9812ae339a809018 /common
parentd44d46e9fafaae85b0ebbcdc53999537a199fa2f (diff)
parentf644081d388b7ca0d19731eec729b7cd0ded4eec (diff)
Merge branch '2020-09-29-assorted-fixes'
- Assorted typo fixes - Correctly migrate some CONFIG_PREBOOT cases to defconfig - Coverity issues in squashfs
Diffstat (limited to 'common')
-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.