summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stuge <peter@stuge.se>2013-07-09 19:43:09 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2013-08-15 20:46:21 +0200
commitf040858ec31ffef5b746bb9856be6395a20c98ce (patch)
treec180e6f77b69321111dbb1cb1bd64e2bf1f8b92c
parent3bfd5b8252c4a188988c7f3441a3ba608ff46822 (diff)
downloadcoreboot-f040858ec31ffef5b746bb9856be6395a20c98ce.tar.xz
payload/SeaBIOS: Add SEABIOS_PS2_TIMEOUT Kconfig variable
This allows mainboards to preconfigure a ps2-keyboard-spinup timeout when SeaBIOS is chosen as the payload. The Kconfig option can be changed manually if CONFIG_EXPERT is set. Change-Id: I5732b18ef04f4bdef6236f35039656ad02011aec Signed-off-by: Peter Stuge <peter@stuge.se> Reviewed-on: http://review.coreboot.org/3734 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/Kconfig9
-rw-r--r--src/arch/x86/Makefile.inc6
2 files changed, 15 insertions, 0 deletions
diff --git a/src/Kconfig b/src/Kconfig
index ce4488d681..a3d572a13a 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -584,6 +584,15 @@ config SEABIOS_MASTER
Newest SeaBIOS version
endchoice
+config SEABIOS_PS2_TIMEOUT
+ prompt "PS/2 keyboard controller initialization timeout (milliseconds)" if PAYLOAD_SEABIOS
+ depends on EXPERT
+ int
+ help
+ Some PS/2 keyboard controllers don't respond to commands immediately
+ after powering on. This specifies how long SeaBIOS will wait for the
+ keyboard controller to become ready before giving up.
+
choice
prompt "FILO version"
default FILO_STABLE
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 0faf140a47..5c286761f2 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -88,6 +88,12 @@ endif
ifeq ($(CONFIG_PAYLOAD_SEABIOS),y)
@printf " PAYLOAD SeaBIOS (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"
$(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_PAYLOAD_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG)
+ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),)
+ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0)
+ @printf " SeaBIOS Wait up to $(CONFIG_SEABIOS_PS2_TIMEOUT) ms for PS/2 keyboard controller initialization\n"
+ $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup
+endif
+endif
endif
ifeq ($(CONFIG_PAYLOAD_FILO),y)
@printf " PAYLOAD FILO (internal, compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n"