[commit] r5790 - in trunk/src: . pc80

[repository service]

Author: oxygene
Date: Thu Sep  9 10:34:02 2010
New Revision: 5790
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5790

Log:
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 
Acked-by: Patrick Georgi

Modified:
   trunk/src/Kconfig.deprecated_options
   trunk/src/pc80/keyboard.c

Modified: trunk/src/Kconfig.deprecated_options
==============================================================================
--- trunk/src/Kconfig.deprecated_options	Wed Sep  8 23:30:07 2010	(r5789)
+++ trunk/src/Kconfig.deprecated_options	Thu Sep  9 10:34:02 2010	(r5790)
@@ -31,3 +31,18 @@
    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".

Modified: trunk/src/pc80/keyboard.c
==============================================================================
--- trunk/src/pc80/keyboard.c	Wed Sep  8 23:30:07 2010	(r5789)
+++ trunk/src/pc80/keyboard.c	Thu Sep  9 10:34:02 2010	(r5790)
@@ -162,6 +162,8 @@
 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 */