diff options
| author | Joel Kitching <kitching@google.com> | 2019-10-07 15:50:01 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-17 11:52:45 +0000 |
| commit | 53332109acd90d34c82e0450b1329096b942523e (patch) | |
| tree | 3f9bcf681e1081a3a09c54fa36fc36980513b8e1 /firmware/include | |
| parent | 1d9945764bb9e159680ef4b3a15c9bcd23fad8fe (diff) | |
| download | vboot-53332109acd90d34c82e0450b1329096b942523e.tar.gz | |
vboot: remove some vboot1 SharedData-related functions
Remove VbSharedDataInit, VbSharedDataReserve,
VbSharedDataSetKernelKey, along with their corresponding tests.
In tests/verify_kernel and utility/load_kernel_test, just copy the
kernel subkey manually for now, until we update LoadKernel to
retrieve the key from vboot2 workbuf instead.
BUG=b:124141368, chromium:968464
TEST=make clean && make runtests
BRANCH=none
Change-Id: I7055be10f0d7a38502fd8108f0bc93c5b78f06c9
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1844598
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware/include')
| -rw-r--r-- | firmware/include/vboot_struct.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/firmware/include/vboot_struct.h b/firmware/include/vboot_struct.h index 849d4b2f..9ed80dd2 100644 --- a/firmware/include/vboot_struct.h +++ b/firmware/include/vboot_struct.h @@ -317,6 +317,13 @@ typedef struct VbSharedDataHeader { #define VB_SHARED_DATA_HEADER_SIZE_V1 1072 #define VB_SHARED_DATA_HEADER_SIZE_V2 1096 +_Static_assert(VB_SHARED_DATA_HEADER_SIZE_V1 + == offsetof(VbSharedDataHeader, recovery_reason), + "VB_SHARED_DATA_HEADER_SIZE_V1 incorrect"); + +_Static_assert(VB_SHARED_DATA_HEADER_SIZE_V2 == sizeof(VbSharedDataHeader), + "VB_SHARED_DATA_HEADER_SIZE_V2 incorrect"); + #define VB_SHARED_DATA_VERSION 2 /* Version for struct_version */ #ifdef __cplusplus |