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

security/vboot/vboot_crtm.h: Remove ENV_ for vboot_measure_cbfs_hook() 

vboot_measure_cbfs_hook() is included when CONFIG_VBOOT_MEASURED_BOOT
is enabled, but this function is defined as 0 in vboot_crtm.h using ENV_

Remove ENV_ for vboot_measure_cbfs_hook() function definition.
This function is added to bootblock stage also.

BUG=NA
TEST=Build Google Banon and Google Cyan

Change-Id: Ic62c18db09c119dfb85340a6b7f36bfd148aaa45
Signed-off-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32532
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Frans Hendriks 2019-05-16 14:46:12 +02:00 committed by Patrick Georgi
parent 7576bd7f42
commit c1b77c1391
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/security/vboot/Makefile.inc
View File

@ -70,6 +70,7 @@ ramstage-y += vboot_common.c
postcar-y += vboot_common.c postcar-y += vboot_common.c
ifeq ($(CONFIG_VBOOT_MEASURED_BOOT),y) ifeq ($(CONFIG_VBOOT_MEASURED_BOOT),y)
bootblock-y += vboot_crtm.c
verstage-y += vboot_crtm.c verstage-y += vboot_crtm.c
romstage-y += vboot_crtm.c romstage-y += vboot_crtm.c
ramstage-y += vboot_crtm.c ramstage-y += vboot_crtm.c

3
src/security/vboot/vboot_crtm.h
View File

@ -46,8 +46,7 @@
*/ */
uint32_t vboot_init_crtm(void); uint32_t vboot_init_crtm(void);
#if (CONFIG(VBOOT_MEASURED_BOOT) && \ #if CONFIG(VBOOT_MEASURED_BOOT)
!ENV_BOOTBLOCK && !ENV_DECOMPRESSOR && !ENV_SMM)
/* /*
* Measures cbfs data via hook (cbfs) * Measures cbfs data via hook (cbfs)
* fh is the cbfs file handle to measure * fh is the cbfs file handle to measure