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>

8 files changed, 13 insertions, 14 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
diff --git a/firmware/lib/ec_sync.c b/firmware/2lib/2ec_sync.c
index c83b0005..5857fc87 100644
--- a/firmware/lib/ec_sync.c
+++ b/firmware/2lib/2ec_sync.c
@@ -6,10 +6,10 @@
  */
 
 #include "2common.h"
+#include "2ec_sync.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2sysincludes.h"
-#include "ec_sync.h"
 #include "vboot_api.h"
 #include "vboot_common.h"
 #include "vboot_display.h"
diff --git a/firmware/lib/include/ec_sync.h b/firmware/2lib/include/2ec_sync.h
index ec1be2b2..ebefb9b6 100644
--- a/firmware/lib/include/ec_sync.h
+++ b/firmware/2lib/include/2ec_sync.h
@@ -5,13 +5,12 @@
  * EC software sync for verified boot
  */
 
-#ifndef VBOOT_REFERENCE_EC_SYNC_H_
-#define VBOOT_REFERENCE_EC_SYNC_H_
+#ifndef VBOOT_REFERENCE_2EC_SYNC_H_
+#define VBOOT_REFERENCE_2EC_SYNC_H_
 
+#include "2api.h"
 #include "vboot_api.h"
 
-struct vb2_context;
-
 /**
  * EC sync, phase 1
  *
@@ -91,4 +90,4 @@ vb2_error_t ec_sync_phase3(struct vb2_context *ctx);
  */
 vb2_error_t ec_sync_all(struct vb2_context *ctx);
 
-#endif  /* VBOOT_REFERENCE_EC_SYNC_H_ */
+#endif  /* VBOOT_REFERENCE_2EC_SYNC_H_ */
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index 7108e903..fe1e7e3d 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -6,12 +6,12 @@
  */
 
 #include "2common.h"
+#include "2ec_sync.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "ec_sync.h"
 #include "load_kernel_fw.h"
 #include "secdata_tpm.h"
 #include "utility.h"
diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c
index dee766f8..864ad971 100644
--- a/firmware/lib/vboot_ui.c
+++ b/firmware/lib/vboot_ui.c
@@ -6,12 +6,12 @@
  */
 
 #include "2common.h"
+#include "2ec_sync.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "ec_sync.h"
 #include "load_kernel_fw.h"
 #include "secdata_tpm.h"
 #include "tlcl.h"
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index 38dd3053..15859c23 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -6,12 +6,12 @@
  */
 
 #include "2common.h"
+#include "2ec_sync.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "ec_sync.h"
 #include "load_kernel_fw.h"
 #include "secdata_tpm.h"
 #include "utility.h"
diff --git a/tests/ec_sync_tests.c b/tests/vb2_ec_sync_tests.c
index ee0434f1..d93c9629 100644
--- a/tests/ec_sync_tests.c
+++ b/tests/vb2_ec_sync_tests.c
@@ -10,10 +10,10 @@
 #include <stdlib.h>
 
 #include "2common.h"
+#include "2ec_sync.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2sysincludes.h"
-#include "ec_sync.h"
 #include "host_common.h"
 #include "load_kernel_fw.h"
 #include "secdata_tpm.h"
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c
index a33c5bc2..ee02fe30 100644
--- a/tests/vboot_api_kernel4_tests.c
+++ b/tests/vboot_api_kernel4_tests.c
@@ -7,11 +7,11 @@
 
 #include "2api.h"
 #include "2common.h"
+#include "2ec_sync.h"
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "ec_sync.h"
 #include "host_common.h"
 #include "load_kernel_fw.h"
 #include "secdata_tpm.h"