diff options
| author | Randall Spangler <rspangler@chromium.org> | 2016-05-10 09:45:05 -0700 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2016-05-11 02:38:15 +0000 |
| commit | 5319565988fc5b1862d649fad985859929946a91 (patch) | |
| tree | 96674926746fa7f7e6eb564359f29cfba19f6d6a | |
| parent | 946abf1439f378dded6d4c4a82b53af86cdf44a3 (diff) | |
| download | vboot-5319565988fc5b1862d649fad985859929946a91.tar.gz | |
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 <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/343920
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | firmware/lib/mocked_rollback_index.c | 6 | ||||
| -rw-r--r-- | 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 86f223b2..d20ca23a 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 4436df54..7a4c0443 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 */ |