Sean Rhodes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60643 )
Change subject: payloads/tianocore: Add option to change Boot Menu key ......................................................................
payloads/tianocore: Add option to change Boot Menu 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 sean@starlabs.systems Change-Id: I41df3e15aa73be41fb9836fe6e202319b02a3ffb --- M payloads/external/Makefile.inc M payloads/external/tianocore/Kconfig M payloads/external/tianocore/Makefile 3 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/60643/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index ade22b5..f6eb85e 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -149,6 +149,7 @@ CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \ CONFIG_TIANOCORE_ABOVE_4G_MEMORY=$(CONFIG_TIANOCORE_ABOVE_4G_MEMORY) \ CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \ + CONFIG_TIANOCORE_BOOT_MENU_F_KEY=$(CONFIG_TIANOCORE_BOOT_MENU_F_KEY) \ CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \ CONFIG_TIANOCORE_COREBOOTPAYLOAD=$(CONFIG_TIANOCORE_COREBOOTPAYLOAD) \ CONFIG_TIANOCORE_SECUREBOOT=$(CONFIG_TIANOCORE_SECUREBOOT) \ diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index ad6533a..f160400 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -116,6 +116,14 @@ bool "Enable Secureboot Support" default y
+config TIANOCORE_BOOT_MENU_F_KEY + string "Function key for boot menu" + help + 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. + endif
if TIANOCORE_COREBOOTPAYLOAD diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index a26a0e8..9c79de9 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -55,6 +55,10 @@ TPM=-D TPM_ENABLE=TRUE endif
+ifneq ($(CONFIG_TIANOCORE_BOOT_MENU_F_KEY),) +BOOT_MENU_KEY=-D BOOT_MENU_KEY=$(CONFIG_TIANOCORE_BOOT_MENU_F_KEY) +endif + TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
ifneq ($(CONFIG_TIANOCORE_USE_8254_TIMER), y)