summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Kconfig.deprecated_options15
-rw-r--r--src/pc80/keyboard.c2
2 files changed, 17 insertions, 0 deletions
diff --git a/src/Kconfig.deprecated_options b/src/Kconfig.deprecated_options
index 219e5d777e..448afca9b2 100644
--- a/src/Kconfig.deprecated_options
+++ b/src/Kconfig.deprecated_options
@@ -31,3 +31,18 @@ config HAVE_BUS_CONFIG
help
This variable specifies whether a given board has a get_bus_conf.c
file containing information about bus routing.
+
+# Will be removed (alongside with the PS2 init code) once payloads
+# reliably support PS2 init themselves.
+config DRIVERS_PS2_KEYBOARD
+ bool "PS2 Keyboard init"
+ default y
+ help
+ Enable this option to initialize PS2 keyboards found connected
+ to the PS2 port. Some payloads (eg, filo) require this
+ option. Other payloads (eg, SeaBIOS, Linux) do not require
+ it. Initializing a PS2 keyboard can take several hundred
+ milliseconds.
+ If you know you will only use a payload which does not require
+ this option, then you can say "n" here to speed up boot time.
+ Otherwise say "y".
diff --git a/src/pc80/keyboard.c b/src/pc80/keyboard.c
index dee6279842..9dadf0e39a 100644
--- a/src/pc80/keyboard.c
+++ b/src/pc80/keyboard.c
@@ -162,6 +162,8 @@ static u8 send_keyboard(u8 command)
void pc_keyboard_init(struct pc_keyboard *keyboard)
{
u8 regval;
+ if (!CONFIG_DRIVERS_PS2_KEYBOARD)
+ return;
printk(BIOS_DEBUG, "Keyboard init...\n");
/* Run a keyboard controller self-test */