x86: coreboot: Drop USB init on startup

This is very annoying as it is quite slow on many machines. Also, U-Boot
has an existing 'preboot' mechanism to enable this feature if desired.

Drop this code so that it is possible to choose whether to init USB or
not.

Use the existing USE_PREBOOT mechanism instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/cpu/coreboot/Kconfig b/arch/x86/cpu/coreboot/Kconfig
index b97c27790419f5018158db9b43838e353b6a6716..178f8ad181628782030937e6d500d6354747aa26 100644 (file)
--- a/arch/x86/cpu/coreboot/Kconfig
+++ b/arch/x86/cpu/coreboot/Kconfig
@@ -25,6 +25,7 @@ config SYS_COREBOOT
        imply FS_CBFS
        imply CBMEM_CONSOLE
        imply X86_TSC_READ_BASE
+       imply USE_PREBOOT
        select BINMAN if X86_64
 
 endif

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index da43d66e95d7dc18b456f9023ecc762b167193a0..82fe4c71cd27f17bb65c23b39c46a09b54e97819 100644 (file)
--- a/arch/x86/cpu/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
@@ -86,10 +86,6 @@ static int last_stage_init(void)
        if (IS_ENABLED(CONFIG_SPL_BUILD))
                return 0;
 
-       /* start usb so that usb keyboard can be used as input device */
-       if (IS_ENABLED(CONFIG_USB_KEYBOARD))
-               usb_init();
-
        board_final_init();
 
        return 0;

diff --git a/doc/board/coreboot/coreboot.rst b/doc/board/coreboot/coreboot.rst
index 3ef563b71dc964e5de2e34f369d0bcc5b69e8727..eac82cc7629b762286667797e54e33d4d45ed8f8 100644 (file)
--- a/doc/board/coreboot/coreboot.rst
+++ b/doc/board/coreboot/coreboot.rst
@@ -83,6 +83,13 @@ build in `$CBDIR`::
       -device ide-hd,drive=disk,bus=ahci.0 \
 
 
+USB keyboard
+------------
+
+The `CONFIG_USE_PREBOOT` option is enabled by default, meaning that USB starts
+up just before the command-line starts. This allows user interaction on
+non-laptop devices which use a USB keyboard.
+
 CBFS access
 -----------