[coreboot-gerrit] Change in coreboot[master]: payloads/tianocore: Enable building with TPM support

[Sean Rhodes (Code Review)]

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

Change subject: payloads/tianocore: Enable building with TPM support
......................................................................

payloads/tianocore: Enable building with TPM support

Signed-off-by: Sean Rhodes 
Change-Id: If14441939eac86ea0f2e76ee9e7fbfc43b9c41f9
---
M payloads/external/Makefile.inc
M payloads/external/tianocore/Kconfig
M payloads/external/tianocore/Makefile
3 files changed, 10 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/60299/1

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 072d8d1..47967b3 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -148,6 +148,7 @@
    	CONFIG_TIANOCORE_UPSTREAM=$(CONFIG_TIANOCORE_UPSTREAM) \
    	CONFIG_ECAM_MMCONF_BASE_ADDRESS=$(CONFIG_ECAM_MMCONF_BASE_ADDRESS) \
    	CONFIG_TIANOCORE_ABOVE_4G_MEMORY=$(CONFIG_TIANOCORE_ABOVE_4G_MEMORY) \
+		CONFIG_TIANOCORE_TPM_SUPPORT=$(CONFIG_TIANOCORE_TPM_SUPPORT) \
    	CONFIG_TIANOCORE_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT) \
    	CONFIG_TIANOCORE_CBMEM_LOGGING=$(CONFIG_TIANOCORE_CBMEM_LOGGING) \
    	CONFIG_TIANOCORE_COREBOOTPAYLOAD=$(CONFIG_TIANOCORE_COREBOOTPAYLOAD) \
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index b7069aa..a300232 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -112,6 +112,10 @@
      useful for bootloaders that are not fully 64-bit aware such as
      Qubes R4.0.4 bootloader.

+config TIANOCORE_TPM_SUPPORT
+	bool "Enable TPM Support"
+	default y
+
 endif

if TIANOCORE_COREBOOTPAYLOAD
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index a4ccfc7..854906e 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -46,6 +46,10 @@
 4G=-D ABOVE_4G_MEMORY=FALSE
 endif

+ifeq ($(CONFIG_TIANOCORE_TPM_SUPPORT),y)
+TPM=-DTPM_ENABLE=TRUE
+endif
+
 TIMEOUT=-D PLATFORM_BOOT_TIMEOUT=$(CONFIG_TIANOCORE_BOOT_TIMEOUT)

ifneq ($(CONFIG_TIANOCORE_USE_8254_TIMER), y)
@@ -55,7 +59,7 @@
 ifeq ($(CONFIG_TIANOCORE_COREBOOTPAYLOAD),y)
 BUILD_STR=-q -a IA32 -a X64 -p CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMER) -DPS2_KEYBOARD_ENABLE
 else
-BUILD_STR=-q -a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMEOUT) $(build_flavor) $(CBMEM) $(4G)
+BUILD_STR=-q -a IA32 -a X64 -p UefiPayloadPkg/UefiPayloadPkg.dsc -t COREBOOT -b $(BUILD_TYPE) $(TIMEOUT) $(build_flavor) $(CBMEM) $(4G) $(TPM)
 endif

all: clean build