summaryrefslogtreecommitdiff
path: root/configs/rpi_2_defconfig
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2020-07-21 09:32:20 +0200
committerTom Rini <trini@konsulko.com>2020-08-04 23:30:02 -0400
commit44758771eefb8e600144e2e0a13cf87b9df64276 (patch)
treec146910a44ef769c6ed3f952e782610b45fbad8b /configs/rpi_2_defconfig
parentdef7a5c00f4a84edf7a8a83c28bf9a7063e00731 (diff)
downloadu-boot-44758771eefb8e600144e2e0a13cf87b9df64276.tar.gz
u-boot-44758771eefb8e600144e2e0a13cf87b9df64276.tar.bz2
u-boot-44758771eefb8e600144e2e0a13cf87b9df64276.zip
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 <dr@jones.dk> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Series-Cc: Jagan Teki <jagan@amarulasolutions.com> Series-Cc: Lukasz Majewski <lukma@denx.de> Series-Cc: Andre Przywara <andre.przywara@arm.com>
Diffstat (limited to 'configs/rpi_2_defconfig')
-rw-r--r--configs/rpi_2_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 867f59c4d4..2ec3c4b9cd 100644
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -9,7 +9,6 @@ CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
CONFIG_DISTRO_DEFAULTS=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_USE_PREBOOT=y
-CONFIG_PREBOOT="usb start"
CONFIG_MISC_INIT_R=y
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set