[PATCH v4 1/2] arm: move CONFIG_PREBOOT="usb start" to KConfig

[Neil Armstrong]

Hi,

On 19/07/2020 15:56, Jonas Smedegaard wrote:
> 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 at jones.dk>
> Series-Cc: Jagan Teki <jagan at amarulasolutions.com>
> Series-Cc: Lukasz Majewski <lukma at denx.de>
> Series-Cc: Andre Przywara <andre.przywara at arm.com>
> 
> ---
> 
> (no changes since v1)
> 
> 
> Changes in v4:
> - generalize to cover all boards, thanks to Jagan Teki
> 
> Changes in v3:
> - move default setting to KConfig, thanks to Andre Przywara and Lukasz Majewski
> 
> Changes in v2:
> - Rephrase commit message to clarify relationship with KConfig entries
> 
> ---
>  common/Kconfig                        | 1 +
>  configs/libretech-ac_defconfig        | 1 -
>  configs/libretech-s905d-pc_defconfig  | 1 -
>  configs/libretech-s912-pc_defconfig   | 1 -
>  configs/pinebook-pro-rk3399_defconfig | 1 -
>  configs/rockpro64-rk3399_defconfig    | 1 -
>  configs/rpi_0_w_defconfig             | 1 -
>  configs/rpi_2_defconfig               | 1 -
>  configs/rpi_3_32b_defconfig           | 1 -
>  configs/rpi_3_b_plus_defconfig        | 1 -
>  configs/rpi_3_defconfig               | 1 -
>  configs/rpi_defconfig                 | 1 -
>  configs/seaboard_defconfig            | 1 -
>  configs/ventana_defconfig             | 1 -
>  include/configs/sunxi-common.h        | 1 -
>  15 files changed, 1 insertion(+), 14 deletions(-)
> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 67b3818fde..62d78c5bd7 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
> diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig
> index d3fc9cb25d..3fb7f36193 100644
> --- a/configs/libretech-ac_defconfig
> +++ b/configs/libretech-ac_defconfig
> @@ -14,7 +14,6 @@ CONFIG_IDENT_STRING=" libretech-ac"
>  CONFIG_DEBUG_UART=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
> diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig
> index 67e52925db..18192ece34 100644
> --- a/configs/libretech-s905d-pc_defconfig
> +++ b/configs/libretech-s905d-pc_defconfig
> @@ -14,7 +14,6 @@ CONFIG_IDENT_STRING=" libretech-s905d-pc"
>  CONFIG_DEBUG_UART=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_CMD_BDI is not set
> diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig
> index 50138aa3ac..6b2c949823 100644
> --- a/configs/libretech-s912-pc_defconfig
> +++ b/configs/libretech-s912-pc_defconfig
> @@ -13,7 +13,6 @@ CONFIG_IDENT_STRING=" libretech-s912-pc"
>  CONFIG_DEBUG_UART=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_CMD_BDI is not set

For Amlogic libretech amlogic boards.

Reviewed-by: Neil Armstrong <narmstrong at baylibre.com>

Neil