From 68fcccbeca257c76e8e9030980873d5d74feff15 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 15 Jun 2016 11:03:45 -0400 Subject: Disable native PS2 keyboard init Both grub and seabios can do keyboard init on their own. This option only slows down the boot process. On the x60 it even makes the keyboard unresponsive. --- diff --git a/resources/libreboot/config/grub/kcma-d8/config b/resources/libreboot/config/grub/kcma-d8/config index abc6efb..9b1d062 100644 --- a/resources/libreboot/config/grub/kcma-d8/config +++ b/resources/libreboot/config/grub/kcma-d8/config @@ -175,7 +175,7 @@ CONFIG_CPU_ADDR_BITS=48 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set diff --git a/resources/libreboot/config/grub/kgpe-d16/config b/resources/libreboot/config/grub/kgpe-d16/config index eb414a3..2f2a7b9 100644 --- a/resources/libreboot/config/grub/kgpe-d16/config +++ b/resources/libreboot/config/grub/kgpe-d16/config @@ -175,7 +175,7 @@ CONFIG_CPU_ADDR_BITS=48 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_2048=y # CONFIG_COREBOOT_ROMSIZE_KB_64 is not set diff --git a/resources/libreboot/config/grub/macbook21/config b/resources/libreboot/config/grub/macbook21/config index 821282a..8378869 100644 --- a/resources/libreboot/config/grub/macbook21/config +++ b/resources/libreboot/config/grub/macbook21/config @@ -141,7 +141,7 @@ CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 diff --git a/resources/libreboot/config/grub/qemu_i440fx_piix4/config b/resources/libreboot/config/grub/qemu_i440fx_piix4/config index 17b36bb..9e1e403 100644 --- a/resources/libreboot/config/grub/qemu_i440fx_piix4/config +++ b/resources/libreboot/config/grub/qemu_i440fx_piix4/config @@ -142,7 +142,7 @@ CONFIG_TTYS0_LCS=3 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_256=y diff --git a/resources/libreboot/config/grub/qemu_q35_ich9/config b/resources/libreboot/config/grub/qemu_q35_ich9/config index bc6e0e7..1012c53 100644 --- a/resources/libreboot/config/grub/qemu_q35_ich9/config +++ b/resources/libreboot/config/grub/qemu_q35_ich9/config @@ -142,7 +142,7 @@ CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set CONFIG_MAINBOARD_VERSION="1.0" -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_256=y diff --git a/resources/libreboot/config/grub/r400_16mb/config b/resources/libreboot/config/grub/r400_16mb/config index 44e314f..5c6c360 100644 --- a/resources/libreboot/config/grub/r400_16mb/config +++ b/resources/libreboot/config/grub/r400_16mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_R400=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/r400_4mb/config b/resources/libreboot/config/grub/r400_4mb/config index e1070ae..d2cc35b 100644 --- a/resources/libreboot/config/grub/r400_4mb/config +++ b/resources/libreboot/config/grub/r400_4mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_R400=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/r400_8mb/config b/resources/libreboot/config/grub/r400_8mb/config index e41bedb..e310e60 100644 --- a/resources/libreboot/config/grub/r400_8mb/config +++ b/resources/libreboot/config/grub/r400_8mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_R400=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/t400_16mb/config b/resources/libreboot/config/grub/t400_16mb/config index 57bb977..6e31c1d 100644 --- a/resources/libreboot/config/grub/t400_16mb/config +++ b/resources/libreboot/config/grub/t400_16mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T400=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/t400_4mb/config b/resources/libreboot/config/grub/t400_4mb/config index d047885..0233ecd 100644 --- a/resources/libreboot/config/grub/t400_4mb/config +++ b/resources/libreboot/config/grub/t400_4mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T400=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/t400_8mb/config b/resources/libreboot/config/grub/t400_8mb/config index 1015c87..1d636d9 100644 --- a/resources/libreboot/config/grub/t400_8mb/config +++ b/resources/libreboot/config/grub/t400_8mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T400=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/t500_16mb/config b/resources/libreboot/config/grub/t500_16mb/config index 42a87f8..deb46d4 100644 --- a/resources/libreboot/config/grub/t500_16mb/config +++ b/resources/libreboot/config/grub/t500_16mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T500=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/t500_4mb/config b/resources/libreboot/config/grub/t500_4mb/config index aa04a94..68d01cc 100644 --- a/resources/libreboot/config/grub/t500_4mb/config +++ b/resources/libreboot/config/grub/t500_4mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T500=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/t500_8mb/config b/resources/libreboot/config/grub/t500_8mb/config index 91b1b38..b58406c 100644 --- a/resources/libreboot/config/grub/t500_8mb/config +++ b/resources/libreboot/config/grub/t500_8mb/config @@ -150,7 +150,7 @@ CONFIG_BOARD_LENOVO_T500=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/t60/config b/resources/libreboot/config/grub/t60/config index bc9e968..48b6d5d 100644 --- a/resources/libreboot/config/grub/t60/config +++ b/resources/libreboot/config/grub/t60/config @@ -151,7 +151,7 @@ CONFIG_SEABIOS_PS2_TIMEOUT=3000 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 diff --git a/resources/libreboot/config/grub/x200_16mb/config b/resources/libreboot/config/grub/x200_16mb/config index 29248dd..eb23dfb 100644 --- a/resources/libreboot/config/grub/x200_16mb/config +++ b/resources/libreboot/config/grub/x200_16mb/config @@ -148,7 +148,7 @@ CONFIG_BOARD_LENOVO_X200=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set # CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/x200_4mb/config b/resources/libreboot/config/grub/x200_4mb/config index 8bcd1dd..de9652c 100644 --- a/resources/libreboot/config/grub/x200_4mb/config +++ b/resources/libreboot/config/grub/x200_4mb/config @@ -148,7 +148,7 @@ CONFIG_BOARD_LENOVO_X200=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set # CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/x200_8mb/config b/resources/libreboot/config/grub/x200_8mb/config index 22ac118..0ed1c49 100644 --- a/resources/libreboot/config/grub/x200_8mb/config +++ b/resources/libreboot/config/grub/x200_8mb/config @@ -148,7 +148,7 @@ CONFIG_BOARD_LENOVO_X200=y CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set # CONFIG_DRIVERS_UART_8250IO is not set # CONFIG_NO_POST is not set CONFIG_BOARD_ROMSIZE_KB_8192=y diff --git a/resources/libreboot/config/grub/x60/config b/resources/libreboot/config/grub/x60/config index 88a8674..f70649c 100644 --- a/resources/libreboot/config/grub/x60/config +++ b/resources/libreboot/config/grub/x60/config @@ -152,7 +152,7 @@ CONFIG_SEABIOS_PS2_TIMEOUT=3000 CONFIG_CPU_ADDR_BITS=36 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 CONFIG_USBDEBUG=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +# CONFIG_DRIVERS_PS2_KEYBOARD is not set CONFIG_DRIVERS_UART_8250IO=y # CONFIG_NO_POST is not set CONFIG_MAXIMUM_SUPPORTED_FREQUENCY=0 -- cgit v0.9.1