From c8decce31cabfe25018409453a3c434aa38a2107 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Wed, 9 Feb 2022 08:25:39 +0000 Subject: payloads/tianocore: Add option to use Escape for Boot Manager Add TIANOCORE_BOOT_MANAGER_ESCAPE which, when enabled, will use Escape as the hot-key to access the Boot Manager. This replaces the default key of F2. Signed-off-by: Sean Rhodes Change-Id: I1e60d116367542f55f0ffa241a6132e4faabe446 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61757 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/external/Makefile.inc | 1 + payloads/external/tianocore/Kconfig | 7 +++++++ payloads/external/tianocore/Makefile | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 5c15af519237..f075aee748d4 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -149,6 +149,7 @@ $(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG) CONFIG_TIANOCORE_RELEASE=$(CONFIG_TIANOCORE_RELEASE) \ CONFIG_TIANOCORE_ABOVE_4G_MEMORY=$(CONFIG_TIANOCORE_ABOVE_4G_MEMORY) \ CONFIG_TIANOCORE_BOOTSPLASH_FILE=$(CONFIG_TIANOCORE_BOOTSPLASH_FILE) \ + CONFIG_TIANOCORE_BOOT_MANAGER_ESCAPE=$(CONFIG_TIANOCORE_BOOT_MANAGER_ESCAPE) \ CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \ CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \ CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \ diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig index 2ef77ba480de..331a1412141c 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -119,6 +119,13 @@ config TIANOCORE_BOOTSPLASH_FILE If an absolute path is not given, the path will assumed to be relative to the coreboot root directory. +config TIANOCORE_BOOT_MANAGER_ESCAPE + bool "Use Escape key for Boot Manager" + default n + help + Use Escape as the hot-key to access the Boot Manager. This replaces + the default key of F2. + config TIANOCORE_BOOT_TIMEOUT int default 2 diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 6dbfe7293c75..ebaccc927b98 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -28,6 +28,10 @@ endif ifneq ($(CONFIG_TIANOCORE_BOOTSPLASH_FILE),) BUILD_STR += -D BOOTSPLASH_IMAGE=TRUE endif +# BOOT_MANAGER_ESCAPE = FALSE +ifeq ($(CONFIG_TIANOCORE_BOOT_MANAGER_ESCAPE),y) +BUILD_STR += -D BOOT_MANAGER_ESCAPE=TRUE +endif # BUILD_TARGETS = DEBUG ifeq ($(CONFIG_TIANOCORE_RELEASE),y) BUILD_STR += -b RELEASE -- cgit v1.2.3