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>

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

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