Patch set updated for coreboot: cfd888d payload/SeaBIOS: Add SEABIOS_PS2_TIMEOUT Kconfig variable

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3734

-gerrit

commit cfd888d855d44f79714cd7bd1d90262e7e75d937
Author: Peter Stuge 
Date:   Tue Jul 9 19:43:09 2013 +0200

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 
---
 src/Kconfig               | 9 +++++++++
 src/arch/x86/Makefile.inc | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/src/Kconfig b/src/Kconfig
index fdf40e5..e3b2728 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -572,6 +572,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 7f1b7b2..0989adf 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -87,6 +87,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"