summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-10-22 15:51:32 +0800
committerCommit Bot <commit-bot@chromium.org>2019-10-25 18:00:14 +0000
commit9d683f60244f95caf8662d6545fae574fe134bce (patch)
treefb437a01f3697a970d99e757525f1fa38c505fdb /Makefile
parentf63c95e2c95b83b731b4ae6d68842dd17917bbe4 (diff)
downloadvboot-9d683f60244f95caf8662d6545fae574fe134bce.tar.gz
vboot: move ec_sync to vboot2 namespace
Move ec_sync.c to vboot2 namespace. Keep its API in vboot_api.h for the time being. BUG=b:124141368, chromium:1016688, b:112198832, b:143094352 TEST=make clean && make runtests BRANCH=none Change-Id: Ia925e93ecdcdb1a2a2724336774f48dbe0439743 Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1872254 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Sean Abraham <seanabraham@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 9972f3da..1a483800 100644
--- a/Makefile
+++ b/Makefile
@@ -338,7 +338,6 @@ FWLIB_SRCS = \
firmware/lib/cgptlib/cgptlib.c \
firmware/lib/cgptlib/cgptlib_internal.c \
firmware/lib/cgptlib/crc32.c \
- firmware/lib/ec_sync.c \
firmware/lib/gpt_misc.c \
firmware/lib/utility_string.c \
firmware/lib/vboot_api_kernel.c \
@@ -356,6 +355,7 @@ FWLIB2X_SRCS = \
firmware/2lib/2api.c \
firmware/2lib/2common.c \
firmware/2lib/2crc8.c \
+ firmware/2lib/2ec_sync.c \
firmware/2lib/2gbb.c \
firmware/2lib/2misc.c \
firmware/2lib/2nvstorage.c \
@@ -678,7 +678,6 @@ TEST_OBJS += ${TESTLIB_OBJS}
# And some compiled tests.
TEST_NAMES = \
tests/cgptlib_test \
- tests/ec_sync_tests \
tests/sha_benchmark \
tests/utility_string_tests \
tests/vboot_api_devmode_tests \
@@ -709,6 +708,7 @@ TEST_NAMES += ${TEST_FUTIL_NAMES}
TEST2X_NAMES = \
tests/vb2_api_tests \
tests/vb2_common_tests \
+ tests/vb2_ec_sync_tests \
tests/vb2_gbb_tests \
tests/vb2_misc_tests \
tests/vb2_nvstorage_tests \
@@ -1246,7 +1246,6 @@ runtestscripts: test_setup genfuzztestcases
.PHONY: runmisctests
runmisctests: test_setup
- ${RUNTEST} ${BUILD_RUN}/tests/ec_sync_tests
ifeq (${TPM2_MODE}${MOCK_TPM},)
# TODO(apronin): tests for TPM2 case?
# secdata_tpm_tests and tlcl_tests only work when MOCK_TPM is disabled
@@ -1267,6 +1266,7 @@ endif
run2tests: test_setup
${RUNTEST} ${BUILD_RUN}/tests/vb2_api_tests
${RUNTEST} ${BUILD_RUN}/tests/vb2_common_tests
+ ${RUNTEST} ${BUILD_RUN}/tests/vb2_ec_sync_tests
${RUNTEST} ${BUILD_RUN}/tests/vb2_gbb_tests
${RUNTEST} ${BUILD_RUN}/tests/vb2_misc_tests
${RUNTEST} ${BUILD_RUN}/tests/vb2_nvstorage_tests