[coreboot-gerrit] Change in coreboot[master]: payloads/tianocore: Add option to disable EFI Shell

[Sean Rhodes (Code Review)]

Sean Rhodes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60793 )

Change subject: payloads/tianocore: Add option to disable EFI Shell
......................................................................

payloads/tianocore: Add option to disable EFI Shell

Signed-off-by: Sean Rhodes 
Change-Id: Icd68aa3183692f0607db9253cde4d41d2e03be41
---
M payloads/external/Makefile.inc
M payloads/external/tianocore/Kconfig
M payloads/external/tianocore/Makefile
3 files changed, 11 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/60793/1

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 0feb20a..a6c7305 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -153,6 +153,7 @@
    	CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \
    	CONFIG_TIANOCORE_COREBOOTPAYLOAD=$(CONFIG_TIANOCORE_COREBOOTPAYLOAD) \
    	CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC=$(CONFIG_TIANOCORE_FOLLOW_BGRT_SPEC) \
+                CONFIG_TIANOCORE_HAVE_EFI_SHELL=$(CONFIG_TIANOCORE_HAVE_EFI_SHELL) \
    	CONFIG_TIANOCORE_SECUREBOOT=$(CONFIG_TIANOCORE_SECUREBOOT) \
    	CONFIG_TIANOCORE_USE_8254_TIMER=$(CONFIG_TIANOCORE_USE_8254_TIMER) \
    	GCC_CC_x86_32=$(GCC_CC_x86_32) \
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index fd406b7..67f1437 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -130,6 +130,12 @@
      Follow the BGRT Specification implemented by Microsoft and
      centre the Boot Logo 38.2% from the top of screen.

+config TIANOCORE_HAVE_EFI_SHELL
+	bool "Include EFI Shell"
+	default y
+	help
+	  Include the EFI shell Binary
+
 endif

if TIANOCORE_COREBOOTPAYLOAD
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 4231c90..33b2a27 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -50,6 +50,10 @@
 KEY=-D BOOT_MANAGER_F7=TRUE
 endif

+ifneq ($(CONFIG_TIANOCORE_HAVE_EFI_SHELL),y)
+SHELL=-D SHELL_TYPE=N
+endif
+
 ifeq ($(CONFIG_TIANOCORE_SECUREBOOT),y)
 SB=-D SECURE_BOOT_ENABLE=TRUE
 endif