summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Hendriks <fhendriks@eltan.com>2019-05-16 14:46:12 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-05-20 14:41:40 +0000
commitc1b77c13911f0fb5db85bb1d6633e26334a9da71 (patch)
treea15e2b99a6da9a58eecabd0fc65863db3013ca11
parent7576bd7f4299a3af220a7ba3d6c4928812c2982b (diff)
downloadcoreboot-c1b77c13911f0fb5db85bb1d6633e26334a9da71.tar.xz
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>
-rw-r--r--src/security/vboot/Makefile.inc1
-rw-r--r--src/security/vboot/vboot_crtm.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 6d2096ddb0..9ce724ed54 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -70,6 +70,7 @@ ramstage-y += vboot_common.c
postcar-y += vboot_common.c
ifeq ($(CONFIG_VBOOT_MEASURED_BOOT),y)
+bootblock-y += vboot_crtm.c
verstage-y += vboot_crtm.c
romstage-y += vboot_crtm.c
ramstage-y += vboot_crtm.c
diff --git a/src/security/vboot/vboot_crtm.h b/src/security/vboot/vboot_crtm.h
index e675edbf03..64cb4f2b40 100644
--- a/src/security/vboot/vboot_crtm.h
+++ b/src/security/vboot/vboot_crtm.h
@@ -46,8 +46,7 @@
*/
uint32_t vboot_init_crtm(void);
-#if (CONFIG(VBOOT_MEASURED_BOOT) && \
-!ENV_BOOTBLOCK && !ENV_DECOMPRESSOR && !ENV_SMM)
+#if CONFIG(VBOOT_MEASURED_BOOT)
/*
* Measures cbfs data via hook (cbfs)
* fh is the cbfs file handle to measure