summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJonas Smedegaard <[email protected]>2020-07-21 09:32:20 +0200
committerTom Rini <[email protected]>2020-08-04 23:30:02 -0400
commit44758771eefb8e600144e2e0a13cf87b9df64276 (patch)
treec146910a44ef769c6ed3f952e782610b45fbad8b /common
parentdef7a5c00f4a84edf7a8a83c28bf9a7063e00731 (diff)
arm: move CONFIG_PREBOOT="usb start" to KConfig
This commit moves CONFIG_PREBOOT="usb start" to common/KConfig for all boards also declaring USB_KEYBOARD. Besides simplifying defconfig files, this also enables support for board-specific CONFIG_PREBOOT for sunxi boards: commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") intended to support CONFIG_PREBOOT, but include/configs/sunxi-common.h hardcodes preboot as part of internally defined CONSOLE_STDIN_SETTINGS, silently ignoring any board-specific CONFIG_PREBOOT. Signed-off-by: Jonas Smedegaard <[email protected]> Reviewed-by: Neil Armstrong <[email protected]> Series-Cc: Jagan Teki <[email protected]> Series-Cc: Lukasz Majewski <[email protected]> Series-Cc: Andre Przywara <[email protected]>
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 67b3818fdef..62d78c5bd73 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -403,6 +403,7 @@ 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