3 files changed, 16 insertions, 0 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 5bd6106dfa..4f5c9851ac 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -154,6 +154,7 @@ $(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG)
 		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 1eaf0c8c96..e1beedb361 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -156,6 +156,12 @@ config TIANOCORE_HAVE_EFI_SHELL
 	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 14ec57a292..ad2d5ec572 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -40,9 +40,18 @@ endif
 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_SUPPORT),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