Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15574
-gerrit
commit ee42678494a4daad393ff6d79ed982685a80a390 Author: Vadim Bendebury vbendeb@chromium.org Date: Sat Jun 25 11:22:12 2016 -0700
mock tpm: drop unused functions
safe_write() and safe_define_space() functions are defined in secdata_mock.c, but not used in mocked TPM mode.
The actual functions have been redefined as static recently and their declarations were removed from src/include/antirollback.h, which now causes compilation problems when CONFIG_VBOOT2_MOCK_SECDATA is defined.
Dropping the functions from secdata_mock.c solves the problem.
BRANCH=none BUG=none TEST=compilation in mock secdata mode does not fail any more.
Change-Id: I60d33a16decb82d7911c21e5e76b24b33771f0bb Signed-off-by: Martin Roth martinroth@chromium.org Original-Commit-Id: c6d7824f52534ecd3b02172cb9078f03e318cb2b Original-Change-Id: Ia781ce99630d759469d2bded40952ed21830e611 Original-Signed-off-by: Vadim Bendebury vbendeb@chromium.org Original-Reviewed-on: https://chromium-review.googlesource.com/356291 Original-Tested-by: Caesar Wang wxt@rock-chips.com Original-Reviewed-by: Aaron Durbin adurbin@chromium.org Original-Reviewed-by: Randall Spangler rspangler@chromium.org --- src/vendorcode/google/chromeos/vboot2/secdata_mock.c | 10 ---------- 1 file changed, 10 deletions(-)
diff --git a/src/vendorcode/google/chromeos/vboot2/secdata_mock.c b/src/vendorcode/google/chromeos/vboot2/secdata_mock.c index 3bd4b17..03616c1 100644 --- a/src/vendorcode/google/chromeos/vboot2/secdata_mock.c +++ b/src/vendorcode/google/chromeos/vboot2/secdata_mock.c @@ -21,16 +21,6 @@ uint32_t tpm_clear_and_reenable(void) return TPM_SUCCESS; }
-uint32_t safe_write(uint32_t index, const void *data, uint32_t length) -{ - return TPM_SUCCESS; -} - -uint32_t safe_define_space(uint32_t index, uint32_t perm, uint32_t size) -{ - return TPM_SUCCESS; -} - uint32_t antirollback_read_space_firmware(struct vb2_context *ctx) { vb2api_secdata_create(ctx);