diff options
| author | Joel Kitching <kitching@google.com> | 2019-12-09 18:51:00 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-22 09:02:03 +0000 |
| commit | e22ceb974fc551e41ca588c2b524a0a91fbe5d5a (patch) | |
| tree | 02206aebc187cf0fe5c21d2ed1ccf7a5b3c82418 /Makefile | |
| parent | 39e34fb71632d2a20363f53d2671c98bc972a093 (diff) | |
| download | vboot-e22ceb974fc551e41ca588c2b524a0a91fbe5d5a.tar.gz | |
vboot: remove secdata TPM backend code
In vboot 2 design, secdata spaces are read/written by the vboot
caller, and not by vboot itself. We still need to maintain a
vb2ex_commit_data callback for edge cases, such as when the vboot
UI prompts the user to reboot.
BUG=b:124141368, chromium:972956
TEST=Build locally, flash and boot eve,
check logs for secdata writes and locks
TEST=make clean && make runtests
BRANCH=none
Change-Id: Ib3b628549185749a290dd65e297f2e19adecbc66
Cq-Depend: chromium:1958012
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1958070
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 7 insertions, 19 deletions
@@ -427,13 +427,9 @@ TLCL_SRCS = \ firmware/lib/tpm2_lite/marshaling.c endif -# Support real TPM unless BIOS sets MOCK_TPM -ifeq (${MOCK_TPM},) -FWLIB_SRCS += \ - firmware/lib/secdata_tpm.c -else +# Support real TPM unless MOCK_TPM is set +ifneq (${MOCK_TPM},) FWLIB_SRCS += \ - firmware/lib/mocked_secdata_tpm.c \ firmware/lib/tpm_lite/mocked_tlcl.c endif @@ -723,16 +719,12 @@ TEST_NAMES = \ tests/vboot_kernel_tests \ tests/verify_kernel -ifeq (${MOCK_TPM},) -# secdata_tpm_tests and tlcl_tests only work when MOCK_TPM is disabled -TEST_NAMES += \ - tests/secdata_tpm_tests -ifeq (${TPM2_MODE},) +ifeq (${MOCK_TPM}${TPM2_MODE},) +# tlcl_tests only works when MOCK_TPM is disabled # TODO(apronin): tests for TPM2 case? TEST_NAMES += \ tests/tlcl_tests endif -endif TEST_FUTIL_NAMES = \ tests/futility/binary_editor \ @@ -1284,15 +1276,11 @@ runtestscripts: test_setup genfuzztestcases .PHONY: runmisctests runmisctests: test_setup -ifeq (${MOCK_TPM},) -# secdata_tpm_tests and tlcl_tests only work when MOCK_TPM is disabled - ${RUNTEST} ${BUILD_RUN}/tests/secdata_tpm_tests -ifeq (${TPM2_MODE},) -# TODO(apronin): tests for TPM2 case? + ${RUNTEST} ${BUILD_RUN}/tests/subprocess_tests +ifeq (${MOCK_TPM}${TPM2_MODE},) +# tlcl_tests only works when MOCK_TPM is disabled ${RUNTEST} ${BUILD_RUN}/tests/tlcl_tests endif -endif - ${RUNTEST} ${BUILD_RUN}/tests/subprocess_tests ${RUNTEST} ${BUILD_RUN}/tests/utility_string_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_devmode_tests ${RUNTEST} ${BUILD_RUN}/tests/vboot_api_kernel2_tests |