[coreboot-gerrit] Change in coreboot[master]: [NOTFORMERGE] mb/facebook/fbg1701: Remove C_ENV_BOOTBLOCK_SIZE

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41694 )

Change subject: [NOTFORMERGE] mb/facebook/fbg1701: Remove C_ENV_BOOTBLOCK_SIZE
......................................................................

[NOTFORMERGE] mb/facebook/fbg1701: Remove C_ENV_BOOTBLOCK_SIZE

Change-Id: I4254d681525327c7eec18832586818e9c4e8eb22
Signed-off-by: Kyösti Mälkki 
---
M configs/config.facebook_fbg1701.mboot_vboot
M src/mainboard/facebook/fbg1701/Kconfig
M src/mainboard/facebook/fbg1701/board_verified_boot.c
3 files changed, 6 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/41694/1

diff --git a/configs/config.facebook_fbg1701.mboot_vboot b/configs/config.facebook_fbg1701.mboot_vboot
index b372bbe..34d349a 100644
--- a/configs/config.facebook_fbg1701.mboot_vboot
+++ b/configs/config.facebook_fbg1701.mboot_vboot
@@ -1,5 +1,4 @@
 CONFIG_VENDOR_FACEBOOK=y
-CONFIG_C_ENV_BOOTBLOCK_SIZE=0x6000
 CONFIG_ONBOARD_SAMSUNG_MEM=y
 CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFF8B000
 CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index ca19e05..d04fb75 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -64,10 +64,6 @@
    bool "TPM Setup in RAMSTAGE"
    default n

-config C_ENV_BOOTBLOCK_SIZE
-	hex "C Bootblock Size"
-	default 0x4000
-
 config VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST
    bool
    default y
diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.c b/src/mainboard/facebook/fbg1701/board_verified_boot.c
index 57bd199..685818b 100644
--- a/src/mainboard/facebook/fbg1701/board_verified_boot.c
+++ b/src/mainboard/facebook/fbg1701/board_verified_boot.c
@@ -8,10 +8,13 @@
 const verify_item_t bootblock_verify_list[] = {
    { VERIFY_FILE, ROMSTAGE, { { NULL, CBFS_TYPE_STAGE } },
    	HASH_IDX_ROM_STAGE, MBOOT_PCR_INDEX_0 },
+#if 0
+/* TODO: Is it possible to remove C_ENV_BOOTBLOCK_SIZE here? */
    { VERIFY_BLOCK, "BootBlock",
    	{ { (void *)0xffffffff - CONFIG_C_ENV_BOOTBLOCK_SIZE + 1,
    	CONFIG_C_ENV_BOOTBLOCK_SIZE, } }, HASH_IDX_BOOTBLOCK,
    	MBOOT_PCR_INDEX_0 },
+#endif
 #if CONFIG(VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST)
    { VERIFY_BLOCK, "PublicKey",
    	{ { (void *)CONFIG_VENDORCODE_ELTAN_VBOOT_KEY_LOCATION,
@@ -34,10 +37,13 @@
    	MBOOT_PCR_INDEX_1 },
    { VERIFY_FILE, "spd.bin", { { NULL, CBFS_TYPE_SPD } },
    	HASH_IDX_SPD0, MBOOT_PCR_INDEX_1 },
+#if 0
+/* TODO: Is it possible to remove C_ENV_BOOTBLOCK_SIZE here? */
    { VERIFY_BLOCK, "BootBlock",
    	{ { (void *)0xffffffff - CONFIG_C_ENV_BOOTBLOCK_SIZE + 1,
    	CONFIG_C_ENV_BOOTBLOCK_SIZE, } }, HASH_IDX_BOOTBLOCK,
    	MBOOT_PCR_INDEX_0 },
+#endif
 #if CONFIG(VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST)
    { VERIFY_BLOCK, "PublicKey",
    	{ { (void *)CONFIG_VENDORCODE_ELTAN_VBOOT_KEY_LOCATION,