diff options
| author | Joel Kitching <kitching@google.com> | 2019-10-07 23:26:57 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-10 10:36:21 +0000 |
| commit | efec8ac6a3b7539ca327b6317f4fac1714cc9401 (patch) | |
| tree | e98fc3897dd9c53a02f32344256e73a8cd921c08 /host | |
| parent | 32ec1ee25c71e64fd7f6d04d4cad3d7fb251060f (diff) | |
| download | vboot-efec8ac6a3b7539ca327b6317f4fac1714cc9401.tar.gz | |
vboot: merge vb2_struct.h into 2struct.h
Also remove unused preamble structs in vboot_struct.h.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: I8b41f24b55eba91b1f952415eda1b532732848eb
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1844601
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/extract_vmlinuz.c | 1 | ||||
| -rw-r--r-- | host/lib/host_common.c | 8 | ||||
| -rw-r--r-- | host/lib/host_keyblock.c | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/host/lib/extract_vmlinuz.c b/host/lib/extract_vmlinuz.c index 93fabaac..1260f112 100644 --- a/host/lib/extract_vmlinuz.c +++ b/host/lib/extract_vmlinuz.c @@ -10,7 +10,6 @@ #include "2common.h" #include "2struct.h" -#include "vb2_struct.h" #include "vboot_host.h" #include "vboot_struct.h" diff --git a/host/lib/host_common.c b/host/lib/host_common.c index 67ad1c07..1833c62d 100644 --- a/host/lib/host_common.c +++ b/host/lib/host_common.c @@ -38,8 +38,8 @@ struct vb2_fw_preamble *vb2_create_fw_preamble( uint8_t *body_sig_dest = kernel_subkey_dest + kernel_subkey->key_size; uint8_t *block_sig_dest = body_sig_dest + body_signature->sig_size; - h->header_version_major = FIRMWARE_PREAMBLE_HEADER_VERSION_MAJOR; - h->header_version_minor = FIRMWARE_PREAMBLE_HEADER_VERSION_MINOR; + h->header_version_major = VB2_FIRMWARE_PREAMBLE_HEADER_VERSION_MAJOR; + h->header_version_minor = VB2_FIRMWARE_PREAMBLE_HEADER_VERSION_MINOR; h->preamble_size = block_size; h->firmware_version = firmware_version; h->flags = flags; @@ -106,8 +106,8 @@ struct vb2_kernel_preamble *vb2_create_kernel_preamble( uint8_t *body_sig_dest = (uint8_t *)(h + 1); uint8_t *block_sig_dest = body_sig_dest + body_signature->sig_size; - h->header_version_major = KERNEL_PREAMBLE_HEADER_VERSION_MAJOR; - h->header_version_minor = KERNEL_PREAMBLE_HEADER_VERSION_MINOR; + h->header_version_major = VB2_KERNEL_PREAMBLE_HEADER_VERSION_MAJOR; + h->header_version_minor = VB2_KERNEL_PREAMBLE_HEADER_VERSION_MINOR; h->preamble_size = block_size; h->kernel_version = kernel_version; h->body_load_address = body_load_address; diff --git a/host/lib/host_keyblock.c b/host/lib/host_keyblock.c index 34071f4a..522e87a9 100644 --- a/host/lib/host_keyblock.c +++ b/host/lib/host_keyblock.c @@ -18,7 +18,6 @@ #include "host_keyblock.h" #include "host_key.h" #include "vb2_common.h" -#include "vb2_struct.h" struct vb2_keyblock *vb2_create_keyblock( const struct vb2_packed_key *data_key, |