diff options
| -rw-r--r-- | payloads/external/Makefile.inc | 1 | ||||
| -rw-r--r-- | payloads/external/edk2/Makefile | 4 |
2 files changed, 5 insertions, 0 deletions
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),) |