From 5ba16d02b6fb27c95c80ce12d976882812e9cfe0 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 25 Jul 2023 19:20:32 -0500 Subject: [PATCH] payloads/edk2: disable TPM support for CR50 TPM Disable TPM support for CR50 TPM when using MrChromebox repo, since it's not currently supported in edk2, and causes some boards (eg AMD Zen-based) to failed to boot. TEST=build/boot on google/frostflow Change-Id: I64b5eb09d64eafd2bed400b7a7c97750cc368aed Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/77270 Reviewed-by: Martin L Roth Reviewed-by: Varshit Pandya Tested-by: build bot (Jenkins) --- payloads/external/Makefile.inc | 1 + payloads/external/edk2/Makefile | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 60af577fc3..8222dc8918 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -192,6 +192,7 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) CONFIG_EDK2_GOP_DRIVER=$(CONFIG_EDK2_GOP_DRIVER) \ CONFIG_EDK2_GOP_FILE=$(CONFIG_EDK2_GOP_FILE) \ CONFIG_INTEL_GMA_VBT_FILE=$(CONFIG_INTEL_GMA_VBT_FILE) \ + CONFIG_TPM_GOOGLE_CR50=$(CONFIG_TPM_GOOGLE_CR50) \ GCC_CC_x86_32=$(GCC_CC_x86_32) \ GCC_CC_x86_64=$(GCC_CC_x86_64) \ GCC_CC_arm=$(GCC_CC_arm) \ diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 0d1e169302..6131c1ca71 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -135,6 +135,10 @@ BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutRow=0 BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdSetupConOutColumn=0 endif +ifeq ($(CONFIG_TPM_GOOGLE_CR50)$(CONFIG_EDK2_REPO_MRCHROMEBOX),yy) +BUILD_STR += -D TPM_ENABLE=FALSE +endif + bootloader = $(word 8,$(subst /, ,$(BUILD_STR))) ifneq ($(CONFIG_EDK2_CUSTOM_BUILD_PARAMS),)