diff options
author | Joel Kitching <kitching@google.com> | 2021-04-14 15:13:28 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-15 19:35:52 +0000 |
commit | c6cf8890532a7b78b6cb3dc534145f500444dae2 (patch) | |
tree | 4e03d65225afd988a7cdb56bb6ee36e025bd01d2 /tests | |
parent | ba23df230a9efe7f6aed8faab4dda944f62f76da (diff) | |
download | vboot-c6cf8890532a7b78b6cb3dc534145f500444dae2.tar.gz |
vboot/vboot_kernel: move kernel/fw struct functions
Relocate currently-in-use kernel struct functions out
of lib20 namespace, and into:
* 2struct.c for functions required at runtime
* host_common.c for functions required by host
Relocate firmware struct functions from 2common.c
into 2struct.c
vb2_common.h may be deleted as a result.
This CL is part of a series to merge vboot1 and vboot2.0
kernel verification code; see b/181739551.
BUG=b:181739551
TEST=make clean && make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: Ic162d9633b6112ddc4a819b3e58d313dc484f304
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2825269
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/vb20_kernel_tests.c | 1 | ||||
-rw-r--r-- | tests/vb2_common3_tests.c | 2 | ||||
-rw-r--r-- | tests/vboot_kernel_tests.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/tests/vb20_kernel_tests.c b/tests/vb20_kernel_tests.c index e71e5ce7..8766114a 100644 --- a/tests/vb20_kernel_tests.c +++ b/tests/vb20_kernel_tests.c @@ -15,7 +15,6 @@ #include "2secdata.h" #include "2sysincludes.h" #include "test_common.h" -#include "vb2_common.h" /* Common context for tests */ static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE] diff --git a/tests/vb2_common3_tests.c b/tests/vb2_common3_tests.c index 42192225..58052040 100644 --- a/tests/vb2_common3_tests.c +++ b/tests/vb2_common3_tests.c @@ -7,6 +7,7 @@ #include <stdio.h> +#include "2common.h" #include "2rsa.h" #include "2sysincludes.h" #include "file_keys.h" @@ -15,7 +16,6 @@ #include "host_key.h" #include "host_signature.h" #include "test_common.h" -#include "vb2_common.h" static void resign_keyblock(struct vb2_keyblock *h, const struct vb2_private_key *key) diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index 01b8b342..7d088ae6 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -20,7 +20,6 @@ #include "host_common.h" #include "load_kernel_fw.h" #include "test_common.h" -#include "vb2_common.h" #include "vboot_api.h" #include "vboot_kernel.h" |