[coreboot-gerrit] Change in coreboot[master]: payloads/tianocore: Add option for PS/2 keyboard support

[Sean Rhodes (Code Review)]

Sean Rhodes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61760 )

Change subject: payloads/tianocore: Add option for PS/2 keyboard support
......................................................................

payloads/tianocore: Add option for PS/2 keyboard support

Add TIANOCORE_PS2_SUPPORT which, when enabled, will build edk2
with PS/2 keyboard support.

Signed-off-by: Sean Rhodes 
Change-Id: Ibabce6ac1ac68ab958610d42c77f3c2c494528ef
---
M payloads/external/Makefile.inc
M payloads/external/tianocore/Kconfig
M payloads/external/tianocore/Makefile
3 files changed, 16 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/61760/1

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index baa6104..ca999e1 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -154,6 +154,7 @@
    	CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \
    	CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC=$(CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC) \
    	CONFIG_TIANOCORE_HAVE_EFI_SHELL=$(CONFIG_TIANOCORE_HAVE_EFI_SHELL) \
+		CONFIG_TIANOCORE_PS2_SUPPORT=$(CONFIG_TIANOCORE_PS2_SUPPORT) \
    	CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \
    	CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \
    	GCC_CC_x86_32=$(GCC_CC_x86_32) \
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index 387a05e..bf662e6 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -147,6 +147,12 @@
    help
      Include the EFI shell Binary

+config TIANOCORE_PS2_SUPPORT
+	bool "Support PS/2 Keyboards"
+	default y
+	help
+	  Include support for PS/2 keyboards
+
 endif

if TIANOCORE_COREBOOTPAYLOAD
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index f40e103..772a66d 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -40,9 +40,18 @@
 ifeq ($(CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC),y)
 BUILD_STR += -D FOLLOW_BGRT_SPEC=TRUE
 endif
+# PS2_KEYBOARD_ENABLE		= FALSE
+ifeq ($(CONFIG_TIANOCORE_PS2_SUPPORT),y)
+BUILD_STR += -D PS2_KEYBOARD_ENABLE=TRUE
+endif
 # PLATFORM_BOOT_TIMEOUT		= 3
 ifneq ($(TIANOCORE_BOOT_TIMEOUT),)
 BUILD_STR += -D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
+endif
+# SIO_BUS_ENABLE		= FALSE
+ifeq ($(CONFIG_TIANOCORE_PS2_KEYBOARD),y)
+BUILD_STR += -D SIO_BUS_ENABLE=TRUE
+endif
 # SHELL_TYPE			= BUILD_SHELL
 ifneq ($(CONFIG_TIANOCORE_HAVE_EFI_SHELL),y)
 BUILD_STR += -D SHELL_TYPE=NONE