summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-05-07 13:01:53 +0800
committerPatrick Georgi <pgeorgi@google.com>2019-05-09 06:31:57 +0000
commit9e8cf3cc869ca70267b43ba4898a9dfa06b5a643 (patch)
treee9884b225d2e6dc04867e0cc99f3efd21c591ddd /src/security
parent0a433db22cd4eca1d26cd20ed4e662ad7c928934 (diff)
vboot: remove use of VbInitParams
The VbInitParams struct will be deprecated. Remove its use in preparation. Additionally, remove use of the flag VB_INIT_OUT_ENABLE_USB_STORAGE, which is no longer used downstream since vboot_reference CL:347257. BUG=b:124141368, chromium:960226 TEST=make clean && make test-abuild BRANCH=none Change-Id: Ibe02cb6ba639de0d7cbdf79fc4dbf49044c92278 Signed-off-by: Joel Kitching <kitching@google.com> Cq-Depend: chromium:1583943 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32664 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/vboot/vboot_common.c2
-rw-r--r--src/security/vboot/vboot_common.h3
-rw-r--r--src/security/vboot/vboot_handoff.c4
3 files changed, 4 insertions, 5 deletions
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index 493cb88898..14f154c438 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -85,7 +85,7 @@ static int vboot_get_handoff_flag(uint32_t flag)
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_check_developer_flag(void)
diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
index 768b29d4fc..9a02303d12 100644
--- a/src/security/vboot/vboot_common.h
+++ b/src/security/vboot/vboot_common.h
@@ -39,7 +39,8 @@ int vboot_check_recovery_request(void);
* vboot shared data as well as the flags from VbInit.
*/
struct vboot_handoff {
- VbInitParams init_params;
+ uint32_t reserved0; /* originally from VbInitParams */
+ 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 178877d847..208663e029 100644
--- a/src/security/vboot/vboot_handoff.c
+++ b/src/security/vboot/vboot_handoff.c
@@ -40,7 +40,7 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff,
{
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;
@@ -61,12 +61,10 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff,
vb_sd->flags |= VBSD_BOOT_REC_SWITCH_ON;
*oflags |= VB_INIT_OUT_ENABLE_RECOVERY;
*oflags |= VB_INIT_OUT_CLEAR_RAM;
- *oflags |= VB_INIT_OUT_ENABLE_USB_STORAGE;
}
if (vb2_sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED) {
*oflags |= VB_INIT_OUT_ENABLE_DEVELOPER;
*oflags |= VB_INIT_OUT_CLEAR_RAM;
- *oflags |= VB_INIT_OUT_ENABLE_USB_STORAGE;
vb_sd->flags |= VBSD_BOOT_DEV_SWITCH_ON;
vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON;
}