GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vboot: remove use of GoogleBinaryBlockHeader 

Remove use of deprecated GoogleBinaryBlockHeader struct, and
replace with vb2_gbb_header.

BUG=b:124141368, chromium:954774
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: Iee3bd877cb1791a689efdeabda324f43f7d0c6f2
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32455
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Joel Kitching 2019-04-25 19:11:13 +08:00 committed by Patrick Georgi
parent 45b824d694
commit 1a6b5c23a1
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/security/vboot/gbb.c
View File

@ -13,17 +13,19 @@
* GNU General Public License for more details.
*/
#define NEED_VB20_INTERNALS /* Peeking into vb2_gbb_header */
#include <commonlib/region.h>
#include <console/console.h>
#include <fmap.h>
#include <gbb_header.h>
#include <security/vboot/gbb.h>
#include <string.h>
#include <vb2_api.h>
#define GBB_FMAP_REGION_NAME "GBB"
/* Copy of GBB header read from boot media. */
static GoogleBinaryBlockHeader gbb_header;
static struct vb2_gbb_header gbb_header;
/*
* Read "GBB" region from SPI flash to obtain GBB header and validate
@ -45,13 +47,14 @@ static int gbb_init(void)
return 1;
if (rdev_readat(&gbb_rdev, &gbb_header, 0,
sizeof(GoogleBinaryBlockHeader)) !=
sizeof(GoogleBinaryBlockHeader)) {
sizeof(struct vb2_gbb_header)) !=
sizeof(struct vb2_gbb_header)) {
printk(BIOS_ERR, "%s: Failure to read GBB header!\n", __func__);
return 1;
}
if (memcmp(gbb_header.signature, GBB_SIGNATURE, GBB_SIGNATURE_SIZE)) {
if (memcmp(gbb_header.signature, VB2_GBB_SIGNATURE,
VB2_GBB_SIGNATURE_SIZE)) {
printk(BIOS_ERR, "%s: Signature check failed!\n", __func__);
return 1;
}

2
src/security/vboot/gbb.h
View File

@ -18,7 +18,7 @@
#include <stdint.h>
/* In order to use GBB_FLAG_* macros from vboot, include gbb_header.h. */
/* In order to use VB2_GBB_FLAG_* macros from vboot, include vb2_api.h. */
/*
* Read flags field from GBB header.

4
src/security/vboot/vboot_common.c
View File

@ -18,12 +18,12 @@
#include <cbmem.h>
#include <console/cbmem_console.h>
#include <fmap.h>
#include <gbb_header.h>
#include <reset.h>
#include <stddef.h>
#include <security/vboot/gbb.h>
#include <security/vboot/vboot_common.h>
#include <security/vboot/vbnv.h>
#include <vb2_api.h>
int vboot_named_region_device(const char *name, struct region_device *rdev)
{
@ -42,7 +42,7 @@ int vboot_can_enable_udc(void)
if (!vboot_developer_mode_enabled())
return 0;
/* Enable if GBB flag is set */
if (gbb_is_flag_set(GBB_FLAG_ENABLE_UDC))
if (gbb_is_flag_set(VB2_GBB_FLAG_ENABLE_UDC))
return 1;
/* Enable if VBNV flag is set */
if (vbnv_udc_enable_flag())