From 5319565988fc5b1862d649fad985859929946a91 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Tue, 10 May 2016 09:45:05 -0700 Subject: [PATCH] vboot: Fix FWMP link error if TPM is mocked The MOCK_TPM build flag caused link to fail because RollbackFwmpRead() was missing its mock. BUG=chromium:601492 BRANCH=baytrail and newer platforms TEST=make -j runtests Hack makefile to add MOCK_TPM := 1 and make -j; no link errors. Change-Id: I3885d6b6c627bf475f4da33ef67f31aec2159799 Signed-off-by: Randall Spangler Reviewed-on: https://chromium-review.googlesource.com/343920 Reviewed-by: Daisuke Nojiri Reviewed-by: Vadim Bendebury --- firmware/lib/mocked_rollback_index.c | 6 ++++++ firmware/lib/rollback_index.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/firmware/lib/mocked_rollback_index.c b/firmware/lib/mocked_rollback_index.c index 86f223b2a5..d20ca23ab4 100644 --- a/firmware/lib/mocked_rollback_index.c +++ b/firmware/lib/mocked_rollback_index.c @@ -82,3 +82,9 @@ uint32_t RollbackBackupWrite(uint8_t *raw) Memcpy(rollback_backup, raw, BACKUP_NV_SIZE); return TPM_SUCCESS; } + +uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) +{ + Memset(fwmp, 0, sizeof(*fwmp)); + return TPM_SUCCESS; +} diff --git a/firmware/lib/rollback_index.c b/firmware/lib/rollback_index.c index 4436df5476..7a4c044376 100644 --- a/firmware/lib/rollback_index.c +++ b/firmware/lib/rollback_index.c @@ -552,6 +552,12 @@ uint32_t RollbackKernelLock(int recovery_mode) return TPM_SUCCESS; } +uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) +{ + Memset(fwmp, 0, sizeof(*fwmp)); + return TPM_SUCCESS; +} + #else uint32_t RollbackS3Resume(void) @@ -678,8 +684,6 @@ uint32_t RollbackKernelLock(int recovery_mode) return r; } -#endif /* DISABLE_ROLLBACK_TPM */ - uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) { uint8_t buf[FWMP_NV_MAX_SIZE]; @@ -749,3 +753,4 @@ uint32_t RollbackFwmpRead(struct RollbackSpaceFwmp *fwmp) return TPM_E_CORRUPTED_STATE; } +#endif /* DISABLE_ROLLBACK_TPM */