Change in coreboot[master]: payloads/tianocore: Add option to use F7 as Boot Manager key

[Sean Rhodes (Code Review)]

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

Change subject: payloads/tianocore: Add option to use F7 as Boot Manager key
......................................................................

payloads/tianocore: Add option to use F7 as Boot Manager key

The coreboot version of Tianocore maps Escape to the boot menu.
This is problematic for many Linux distributions that use GRUB,
as this also maps Escape to access it's menu. This option can
be used to specific an F-Key to replace Escape

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/60761/1

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index ade22b5..e5c76bf 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -148,6 +148,7 @@
    	CONFIG_TIANOCORE_UPSTREAM=$(CONFIG_TIANOCORE_UPSTREAM) \
    	CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \
    	CONFIG_TIANOCORE_ABOVE_4G_MEMORY=$(CONFIG_TIANOCORE_ABOVE_4G_MEMORY) \
+		CONFIG_TIANOCORE_BOOT_MANAGER_F7=$(CONFIG_TIANOCORE_BOOT_MANAGER_F7) \
    	CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \
    	CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \
    	CONFIG_TIANOCORE_COREBOOTPAYLOAD=$(CONFIG_TIANOCORE_COREBOOTPAYLOAD) \
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index 1291122..bbc3788 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -116,6 +116,13 @@
    bool "Enable Secure Boot Support"
    default y

+config TIANOCORE_BOOT_MANAGER_F7
+	bool "Use F7 key for Boot Manager"
+	default n
+	help
+	  Use F7 as the hot-key to access the Boot Manager. This replaces
+	  the default key of Esc, which can conflict with GRUB.
+
 endif

if TIANOCORE_COREBOOTPAYLOAD
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index e54b739..3aadf8e 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -46,6 +46,9 @@
 4G=-D ABOVE_4G_MEMORY=FALSE
 endif

+ifeq ($(CONFIG_TIANOCORE_BOOT_MANAGER_F7),y)
+KEY=-D BOOT_MANAGER_F7=TRUE
+endif

ifeq ($(CONFIG_TIANOCORE_SECUREBOOT),y)
 SB=-D SECURE_BOOT_ENABLE=TRUE