Sean Rhodes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61759 )
Change subject: payloads/tianocore: Add option to include EFI Shell ......................................................................
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 --- M payloads/external/Makefile.inc M payloads/external/tianocore/Kconfig M payloads/external/tianocore/Makefile 3 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/61759/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 06a8ca2..baa6104 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -153,6 +153,7 @@ 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 9989457..387a05e 100644 --- a/payloads/external/tianocore/Kconfig +++ b/payloads/external/tianocore/Kconfig @@ -138,8 +138,14 @@ 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 15dbd19..f40e103 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -43,6 +43,9 @@ # 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)