summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorSean Rhodes <sean@starlabs.systems>2022-02-09 08:30:07 +0000
committerFelix Held <felix-coreboot@felixheld.de>2022-02-24 00:29:14 +0000
commitf33ddb3959f9b2bafbf4d2e2f2059ca6074e2a00 (patch)
tree3b1b549411c900797e456a63ff36586b0f077ec8 /payloads
parent14d67b351555c4ddfe0ad6ed031d09298c6a7e96 (diff)
payloads/tianocore: Add option to include EFI Shell
Add TIANOCORE_HAVE_EFI_SHELL, which when enabled, will build edk2 with the EFI Shell binary. Signed-off-by: Sean Rhodes <sean@starlabs.systems> Change-Id: I1272f514e3f5becfe1fddd58ca0d820c5d1c1b54 Reviewed-on: https://review.coreboot.org/c/coreboot/+/61759 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/external/Makefile.inc1
-rw-r--r--payloads/external/tianocore/Kconfig10
-rw-r--r--payloads/external/tianocore/Makefile3
3 files changed, 12 insertions, 2 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 57bfd0111e..5bd6106dfa 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -153,6 +153,7 @@ $(obj)/UEFIPAYLOAD.fd tianocore: $(DOTCONFIG)
CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \
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_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 d6225134fa..1eaf0c8c96 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -147,8 +147,14 @@ config TIANOCORE_FOLLOW_BGRT_SPEC
default n
help
Follow the BGRT Specification implemented by Microsoft and
- the Boot Logo will be vertically centered 38.2% from the
- top of the display.
+ the Boot Logo 38.2% will be vertically centered 38.2% from
+ the top of the display.
+
+config TIANOCORE_HAVE_EFI_SHELL
+ bool "Include EFI Shell"
+ default y
+ help
+ Include the EFI shell Binary
endif
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 9c9cc9a05e..14ec57a292 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -43,6 +43,9 @@ endif
# PLATFORM_BOOT_TIMEOUT = 3
ifneq ($(TIANOCORE_BOOT_TIMEOUT),)
BUILD_STR += -D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)
+# SHELL_TYPE = BUILD_SHELL
+ifneq ($(CONFIG_TIANOCORE_HAVE_EFI_SHELL),y)
+BUILD_STR += -D SHELL_TYPE=NONE
endif
# USE_CBMEM_FOR_CONSOLE = FALSE
ifeq ($(CONFIG_TIANOCORE_CBMEM_LOGGING),y)