summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Rhodes <sean@starlabs.systems>2022-02-09 08:25:39 +0000
committerFelix Held <felix-coreboot@felixheld.de>2022-02-24 00:28:47 +0000
commitc8decce31cabfe25018409453a3c434aa38a2107 (patch)
tree854994f054b82ee68dbb950245866198f40b2750
parentb2c681fc4a1d852f5b436660e7d3a967cf5e7333 (diff)
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 <sean@starlabs.systems> Change-Id: I1e60d116367542f55f0ffa241a6132e4faabe446 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61757 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--payloads/external/Makefile.inc1
-rw-r--r--payloads/external/tianocore/Kconfig7
-rw-r--r--payloads/external/tianocore/Makefile4
3 files changed, 12 insertions, 0 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 5c15af5192..f075aee748 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 2ef77ba480..331a141214 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 6dbfe7293c..ebaccc927b 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