diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-29 13:24:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-29 13:24:50 -0400 |
| commit | 421ebb713b8ede345a4aad0e95fbd6518ac6800d (patch) | |
| tree | e4eeb9199ff2c3753af6d44a9812ae339a809018 /common | |
| parent | d44d46e9fafaae85b0ebbcdc53999537a199fa2f (diff) | |
| parent | f644081d388b7ca0d19731eec729b7cd0ded4eec (diff) | |
| download | u-boot-421ebb713b8ede345a4aad0e95fbd6518ac6800d.zip u-boot-421ebb713b8ede345a4aad0e95fbd6518ac6800d.tar.gz u-boot-421ebb713b8ede345a4aad0e95fbd6518ac6800d.tar.bz2 | |
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/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Kconfig b/common/Kconfig index b1934b3..9c20a97 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. |