From 44758771eefb8e600144e2e0a13cf87b9df64276 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 21 Jul 2020 09:32:20 +0200 Subject: 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 Reviewed-by: Neil Armstrong Series-Cc: Jagan Teki Series-Cc: Lukasz Majewski Series-Cc: Andre Przywara --- configs/rpi_2_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'configs/rpi_2_defconfig') 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 -- cgit v1.2.1