summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-08-29 13:27:23 +0800
committerCommit Bot <commit-bot@chromium.org>2019-09-05 14:29:06 +0000
commit110df5cafaa55eb0e78f379be7731f8d7b3914b7 (patch)
treef572e9a14691070162529d9de3261be5258608ed /Makefile
parent0961b80b9d2e6d5564024ca89d1f4d081d0baf34 (diff)
downloadvboot-110df5cafaa55eb0e78f379be7731f8d7b3914b7.tar.gz
vboot/secdata: rename rollback_index to secdata_tpm
These secure spaces are now used for more than just rollback versions and should be renamed thus. Note: Originally this rename operation was batched into the CL which rewrites the functions in rollback_index/secdata_tpm, but it made reviewing in Gerrit a pain, since it couldn't pick up on the file renames, and instead showed them as deletes/adds. Doing the rename separately helps ensure all references to rollback_index are updated, and gives us a better review experience in Gerrit. BUG=b:124141368, chromium:972956 TEST=make clean && make runtests BRANCH=none Change-Id: I51e5c731e0d7a071d384c28da56e7adce64ba943 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776279 Commit-Queue: Joel Kitching <kitching@chromium.org> Tested-by: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e6c62846..fa63773b 100644
--- a/Makefile
+++ b/Makefile
@@ -395,11 +395,11 @@ endif
# Support real TPM unless BIOS sets MOCK_TPM
ifeq (${MOCK_TPM},)
FWLIB_SRCS += \
- firmware/lib/rollback_index.c \
+ firmware/lib/secdata_tpm.c \
${TLCL_SRCS}
else
FWLIB_SRCS += \
- firmware/lib/mocked_rollback_index.c \
+ firmware/lib/mocked_secdata_tpm.c \
firmware/lib/tpm_lite/mocked_tlcl.c
endif
@@ -691,10 +691,10 @@ TEST_NAMES = \
ifeq (${TPM2_MODE}${MOCK_TPM},)
# TODO(apronin): tests for TPM2 case?
-# tlcl_tests and rollback_index2_tests only work when MOCK_TPM is disabled
+# secdata_tpm_tests and tlcl_tests only work when MOCK_TPM is disabled
TEST_NAMES += \
- tests/tlcl_tests \
- tests/rollback_index2_tests
+ tests/secdata_tpm_tests \
+ tests/tlcl_tests
endif
TEST_FUTIL_NAMES = \
@@ -1255,9 +1255,9 @@ runmisctests: test_setup
${RUNTEST} ${BUILD_RUN}/tests/ec_sync_tests
ifeq (${TPM2_MODE}${MOCK_TPM},)
# TODO(apronin): tests for TPM2 case?
-# tlcl_tests and rollback_index2_tests only work when MOCK_TPM is disabled
+# secdata_tpm_tests and tlcl_tests only work when MOCK_TPM is disabled
+ ${RUNTEST} ${BUILD_RUN}/tests/secdata_tpm_tests
${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests
- ${RUNTEST} ${BUILD_RUN}/tests/rollback_index2_tests
endif
${RUNTEST} ${BUILD_RUN}/tests/utility_string_tests
${RUNTEST} ${BUILD_RUN}/tests/vboot_api_devmode_tests