diff options
| author | Joel Kitching <kitching@google.com> | 2019-10-22 15:51:32 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-25 18:00:14 +0000 |
| commit | 9d683f60244f95caf8662d6545fae574fe134bce (patch) | |
| tree | fb437a01f3697a970d99e757525f1fa38c505fdb /firmware | |
| parent | f63c95e2c95b83b731b4ae6d68842dd17917bbe4 (diff) | |
| download | vboot-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 'firmware')
| -rw-r--r-- | firmware/2lib/2ec_sync.c (renamed from firmware/lib/ec_sync.c) | 2 | ||||
| -rw-r--r-- | firmware/2lib/include/2ec_sync.h (renamed from firmware/lib/include/ec_sync.h) | 9 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 2 | ||||
| -rw-r--r-- | firmware/lib/vboot_ui.c | 2 | ||||
| -rw-r--r-- | firmware/lib/vboot_ui_menu.c | 2 |
5 files changed, 8 insertions, 9 deletions
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" |