Christian Walter has uploaded this change for review.

View Change

Fix VBOOT

Change-Id: Ie1341ac40086f1ed878f7c86a8963f913adf6bcd
Signed-off-by: Christian Walter <christian.walter@9elements.com>
---
M src/security/vboot/Makefile.inc
M src/security/vboot/tpm_common.c
2 files changed, 2 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/34654/1

diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 33a9a5e..d554f10 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -89,8 +89,8 @@
 romstage-$(CONFIG_VBOOT_SEPARATE_VERSTAGE) += secdata_tpm.c
 endif
 
-ifneq ($(filter y,$(CONFIG_TPM1) $(CONFIG_TPM2)),)
-verstage-y+= tpm_common.c
+ifneq ($(CONFIG_TPM1)$(CONFIG_TPM2),)
+verstage-y += tpm_common.c
 endif
 
 romstage-y += vboot_logic.c
diff --git a/src/security/vboot/tpm_common.c b/src/security/vboot/tpm_common.c
index 02fb810..9d4d8f2 100644
--- a/src/security/vboot/tpm_common.c
+++ b/src/security/vboot/tpm_common.c
@@ -14,7 +14,6 @@
 
 #include <security/tpm/tspi.h>
 #include <vb2_api.h>
-#include <security/vboot/antirollback.h>
 #include <security/vboot/tpm_common.h>
 
 #define TPM_PCR_GBB_FLAGS_NAME "GBB flags"

To view, visit change 34654. To unsubscribe, or for help writing mail filters, visit settings.