From fb81474aa5fb92e5f514165572dfdcaae9a50ce0 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Mon, 7 Nov 2016 23:33:46 -0800 Subject: [PATCH] TPM: Add TPM driver files to romstage This driver is required for reading and updating TPM space for recovery MRC data hash in romstage. BUG=chrome-os-partner:59355 BRANCH=None TEST=Compiles successfully for reef. Change-Id: I8edb7af13285a7a192e3d55fc6a11cfe12654bf9 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/17270 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/lib/Makefile.inc | 8 ++++++++ src/vboot/Makefile.inc | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 67f8364aa8..36591adbb6 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -52,10 +52,18 @@ verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c ifeq ($(MOCK_TPM),1) libverstage-y += mocked_tlcl.c +romstage-$(CONFIG_SEPARATE_VERSTAGE) += mocked_tlcl.c else libverstage-$(CONFIG_TPM) += tlcl.c libverstage-$(CONFIG_TPM2) += tpm2_marshaling.c libverstage-$(CONFIG_TPM2) += tpm2_tlcl.c + +ifeq ($(CONFIG_SEPARATE_VERSTAGE),y) +romstage-$(CONFIG_TPM) += tlcl.c +romstage-$(CONFIG_TPM2) += tpm2_marshaling.c +romstage-$(CONFIG_TPM2) += tpm2_tlcl.c +endif # CONFIG_SEPARATE_VERSTAGE + endif verstage-$(CONFIG_GENERIC_UDELAY) += timer.c diff --git a/src/vboot/Makefile.inc b/src/vboot/Makefile.inc index 82b4ac2e9e..05870cab68 100644 --- a/src/vboot/Makefile.inc +++ b/src/vboot/Makefile.inc @@ -67,8 +67,10 @@ verstage-y += common.c verstage-y += verstage.c ifeq (${CONFIG_VBOOT_MOCK_SECDATA},y) libverstage-y += secdata_mock.c +romstage-$(CONFIG_SEPARATE_VERSTAGE) += secdata_mock.c else libverstage-y += secdata_tpm.c +romstage-$(CONFIG_SEPARATE_VERSTAGE) += secdata_tpm.c endif romstage-y += vboot_handoff.c common.c