summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2010-09-09 08:34:02 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-09-09 08:34:02 +0000
commit9c35c8409db16cd88dd93266575766f8a1695a27 (patch)
treec606eba56a94f481b833843a8080a54a30129782
parent080ed7c5d586b7f610af5a6ecd6fbf48bc802fe6 (diff)
downloadcoreboot-9c35c8409db16cd88dd93266575766f8a1695a27.tar.xz
Add a DRIVERS_PS2_KEYBOARD option which controls the PS2 keyboard
initialization. Not all payloads require it and some keyboards take a long time to init. Signed-off-by: Kevin O'Connor <kevin@koconnor.net> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5790 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-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 */