diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.c b/src/mainboard/facebook/fbg1701/board_verified_boot.c
index 57bd199543..a03c6fc615 100644
--- a/src/mainboard/facebook/fbg1701/board_verified_boot.c
+++ b/src/mainboard/facebook/fbg1701/board_verified_boot.c
@@ -8,10 +8,8 @@
 const verify_item_t bootblock_verify_list[] = {
 	{ VERIFY_FILE, ROMSTAGE, { { NULL, CBFS_TYPE_STAGE } },
 		HASH_IDX_ROM_STAGE, MBOOT_PCR_INDEX_0 },
-	{ VERIFY_BLOCK, "BootBlock",
-		{ { (void *)0xffffffff - CONFIG_C_ENV_BOOTBLOCK_SIZE + 1,
-		CONFIG_C_ENV_BOOTBLOCK_SIZE, } }, HASH_IDX_BOOTBLOCK,
-		MBOOT_PCR_INDEX_0 },
+	{ VERIFY_FILE, BOOTBLOCK, { { NULL, CBFS_TYPE_BOOTBLOCK } },
+		HASH_IDX_BOOTBLOCK, MBOOT_PCR_INDEX_0 },
 #if CONFIG(VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST)
 	{ VERIFY_BLOCK, "PublicKey",
 		{ { (void *)CONFIG_VENDORCODE_ELTAN_VBOOT_KEY_LOCATION,
@@ -34,10 +32,8 @@ const verify_item_t romstage_verify_list[] = {
 		MBOOT_PCR_INDEX_1 },
 	{ VERIFY_FILE, "spd.bin", { { NULL, CBFS_TYPE_SPD } },
 		HASH_IDX_SPD0, MBOOT_PCR_INDEX_1 },
-	{ VERIFY_BLOCK, "BootBlock",
-		{ { (void *)0xffffffff - CONFIG_C_ENV_BOOTBLOCK_SIZE + 1,
-		CONFIG_C_ENV_BOOTBLOCK_SIZE, } }, HASH_IDX_BOOTBLOCK,
-		MBOOT_PCR_INDEX_0 },
+	{ VERIFY_FILE, BOOTBLOCK, { { NULL, CBFS_TYPE_BOOTBLOCK } },
+		HASH_IDX_BOOTBLOCK, MBOOT_PCR_INDEX_0 },
 #if CONFIG(VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST)
 	{ VERIFY_BLOCK, "PublicKey",
 		{ { (void *)CONFIG_VENDORCODE_ELTAN_VBOOT_KEY_LOCATION,
diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.h b/src/mainboard/facebook/fbg1701/board_verified_boot.h
index 589006b510..b5ff5f838a 100644
--- a/src/mainboard/facebook/fbg1701/board_verified_boot.h
+++ b/src/mainboard/facebook/fbg1701/board_verified_boot.h
@@ -6,6 +6,7 @@
 #include <vboot_check.h>
 
 /* Define the items to be measured or verified */
+#define BOOTBLOCK (const char *)"bootblock"
 #define FSP (const char *)"fsp.bin"
 #define CMOS_LAYOUT (const char *)"cmos_layout.bin"
 #define RAMSTAGE (const char *)CONFIG_CBFS_PREFIX"/ramstage"