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 /futility | |
| 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 'futility')
| -rw-r--r-- | futility/cmd_show.c | 1 | ||||
| -rw-r--r-- | futility/cmd_sign.c | 1 | ||||
| -rw-r--r-- | futility/cmd_vbutil_kernel.c | 1 | ||||
| -rw-r--r-- | futility/file_type_bios.c | 1 | ||||
| -rw-r--r-- | futility/updater.c | 1 | ||||
| -rw-r--r-- | futility/updater_archive.c | 1 | ||||
| -rw-r--r-- | futility/vb1_helper.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/futility/cmd_show.c b/futility/cmd_show.c index f3b91631..716b2b2b 100644 --- a/futility/cmd_show.c +++ b/futility/cmd_show.c @@ -31,7 +31,6 @@ #include "host_key21.h" #include "util_misc.h" #include "vb1_helper.h" -#include "vb2_common.h" /* Options */ struct show_option_s show_option = { diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index 6243e3a8..9bfa7fdb 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -29,7 +29,6 @@ #include "kernel_blob.h" #include "util_misc.h" #include "vb1_helper.h" -#include "vb2_common.h" /* Options */ struct sign_option_s sign_option = { diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index 27cbb9bc..7268bee2 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -26,7 +26,6 @@ #include "host_common.h" #include "kernel_blob.h" #include "vb1_helper.h" -#include "vb2_common.h" /* Global opts */ static int opt_verbose; diff --git a/futility/file_type_bios.c b/futility/file_type_bios.c index 7e805f50..fe0b223e 100644 --- a/futility/file_type_bios.c +++ b/futility/file_type_bios.c @@ -16,7 +16,6 @@ #include "futility_options.h" #include "host_common.h" #include "vb1_helper.h" -#include "vb2_common.h" static const char * const fmap_name[] = { "GBB", /* BIOS_FMAP_GBB */ diff --git a/futility/updater.c b/futility/updater.c index fa008542..87ac6fd8 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -14,7 +14,6 @@ #include "host_misc.h" #include "updater.h" #include "util_misc.h" -#include "vb2_common.h" #define REMOVE_WP_URL "https://goo.gl/ces83U" diff --git a/futility/updater_archive.c b/futility/updater_archive.c index f2475b6a..4ad5287f 100644 --- a/futility/updater_archive.c +++ b/futility/updater_archive.c @@ -33,7 +33,6 @@ #include "host_misc.h" #include "updater.h" #include "util_misc.h" -#include "vb2_common.h" /* * A firmware update package (archive) is a file packed by either shar(1) or diff --git a/futility/vb1_helper.c b/futility/vb1_helper.c index ecb193b5..39bb16ae 100644 --- a/futility/vb1_helper.c +++ b/futility/vb1_helper.c @@ -21,7 +21,6 @@ #include "kernel_blob.h" #include "util_misc.h" #include "vb1_helper.h" -#include "vb2_common.h" /****************************************************************************/ /* Here are globals containing all the bits & pieces I'm working on. |