Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32664
Change subject: vboot: remove use of VbInitParams ......................................................................
vboot: remove use of VbInitParams
The VbInitParams struct will be deprecated. Remove its use in preparation.
BUG=b:124141368, b:124192753 TEST=make clean && make test-abuild BRANCH=none
Change-Id: Ibe02cb6ba639de0d7cbdf79fc4dbf49044c92278 Signed-off-by: Joel Kitching kitching@google.com Cq-Depend: chromium:TODO --- M src/security/vboot/vboot_common.c M src/security/vboot/vboot_common.h M src/security/vboot/vboot_handoff.c 3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/32664/1
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c index b434f8d..b2582f1 100644 --- a/src/security/vboot/vboot_common.c +++ b/src/security/vboot/vboot_common.c @@ -85,7 +85,7 @@ if (vboot_get_handoff_info((void **)&vbho, NULL)) return 0;
- return !!(vbho->init_params.out_flags & flag); + return !!(vbho->out_flags & flag); }
int vboot_handoff_skip_display_init(void) diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h index 8c92437..119e871 100644 --- a/src/security/vboot/vboot_common.h +++ b/src/security/vboot/vboot_common.h @@ -39,7 +39,7 @@ * vboot shared data as well as the flags from VbInit. */ struct vboot_handoff { - VbInitParams init_params; + uint32_t out_flags; uint32_t selected_firmware; char shared_data[VB_SHARED_DATA_MIN_SIZE]; } __packed; diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c index ff938e1..491e1f2 100644 --- a/src/security/vboot/vboot_handoff.c +++ b/src/security/vboot/vboot_handoff.c @@ -40,7 +40,7 @@ { VbSharedDataHeader *vb_sd = (VbSharedDataHeader *)vboot_handoff->shared_data; - uint32_t *oflags = &vboot_handoff->init_params.out_flags; + uint32_t *oflags = &vboot_handoff->out_flags;
vb_sd->flags |= VBSD_BOOT_FIRMWARE_VBOOT2;