diff options
| author | Joel Kitching <kitching@google.com> | 2020-02-13 17:13:04 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-19 10:29:53 +0000 |
| commit | 83ab1908e8173cddc8405a341fe1dc79a2c8d911 (patch) | |
| tree | 3bafb48b6bfd0ee691d5b28f80894b7ea2e61f0f /utility | |
| parent | 414f0078d2c57eb0bf6334d0b7486e1ebb36a499 (diff) | |
| download | vboot-83ab1908e8173cddc8405a341fe1dc79a2c8d911.tar.gz | |
vboot: use vboot2 for storing kernel rollback versions
Migrate to using vboot2 shared data fields for storing
kernel rollback versions:
kernel_version_tpm_start(1) --> kernel_version_secdata(2)
kernel_version_tpm(1) --> kernel_version(2)
kernel_version_lowest(1) --> [removed]
Also remove VBSD from tests which no longer need it.
BUG=b:124141368, chromium:1038260
TEST=make clean && make runtests
BRANCH=none
Change-Id: I26c2ccede5fba52e1477b625ef5fc6181f60aadf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2053179
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'utility')
| -rw-r--r-- | utility/load_kernel_test.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/utility/load_kernel_test.c b/utility/load_kernel_test.c index 14e4e613..609a9a3a 100644 --- a/utility/load_kernel_test.c +++ b/utility/load_kernel_test.c @@ -24,10 +24,6 @@ static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]; static struct vb2_context *ctx; static struct vb2_shared_data *sd; -static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE] - __attribute__((aligned(VB2_WORKBUF_ALIGN))); -static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data; - /* Global variables for stub functions */ static LoadKernelParams lkp; static FILE *image_file = NULL; @@ -217,9 +213,7 @@ int main(int argc, char* argv[]) fprintf(stderr, "Can't initialize workbuf\n"); return 1; } - memset(&shared_data, 0, sizeof(shared_data)); sd = vb2_get_sd(ctx); - sd->vbsd = shared; /* Copy kernel subkey to workbuf, if any */ if (key_blob) { |