From 5ec8069f8087b4c0b5a12df19a45d49613f1d984 Mon Sep 17 00:00:00 2001 From: Wim Vervoorn Date: Wed, 13 Nov 2019 16:50:00 +0100 Subject: mb/facebook/fbg1701: Correct the postcar_verify_list The postcar_verify_list should contain the items that should be verified before the postcar stage is started. BUG=N/A TEST=build Change-Id: I328858e4803873fed6d47313def5e7b9a434e8ad Signed-off-by: Wim Vervoorn Reviewed-on: https://review.coreboot.org/c/coreboot/+/36815 Tested-by: build bot (Jenkins) Reviewed-by: Frans Hendriks --- src/mainboard/facebook/fbg1701/board_verified_boot.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.c b/src/mainboard/facebook/fbg1701/board_verified_boot.c index 09f4e6791e..7421a14e67 100644 --- a/src/mainboard/facebook/fbg1701/board_verified_boot.c +++ b/src/mainboard/facebook/fbg1701/board_verified_boot.c @@ -56,10 +56,6 @@ 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 }, -#if CONFIG(POSTCAR_STAGE) - { VERIFY_FILE, POSTCAR, { { NULL, CBFS_TYPE_STAGE } }, - HASH_IDX_POSTCAR_STAGE, MBOOT_PCR_INDEX_0 }, -#endif { VERIFY_BLOCK, "BootBlock", { { (void *)0xffffffff - CONFIG_C_ENV_BOOTBLOCK_SIZE + 1, CONFIG_C_ENV_BOOTBLOCK_SIZE, } }, HASH_IDX_BOOTBLOCK, @@ -80,17 +76,10 @@ const verify_item_t ramstage_verify_list[] = { { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 } }; -/* POSTCAR */ /* The items used by the postcar stage */ const verify_item_t postcar_verify_list[] = { - { VERIFY_FILE, RAMSTAGE, { { ram_stage_additional_list, - CBFS_TYPE_STAGE } }, HASH_IDX_RAM_STAGE, MBOOT_PCR_INDEX_0 }, - { VERIFY_FILE, MICROCODE, { { NULL, CBFS_TYPE_MICROCODE } }, - HASH_IDX_MICROCODE, MBOOT_PCR_INDEX_1 }, - { VERIFY_FILE, FSP, { { NULL, CBFS_TYPE_FSP } }, HASH_IDX_FSP, - MBOOT_PCR_INDEX_1 }, - { VERIFY_FILE, "spd.bin", { { NULL, CBFS_TYPE_SPD } }, HASH_IDX_SPD0, - MBOOT_PCR_INDEX_1 }, + { VERIFY_FILE, POSTCAR, { { NULL, CBFS_TYPE_STAGE } }, + HASH_IDX_POSTCAR_STAGE, MBOOT_PCR_INDEX_0 }, { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 } }; -- cgit v1.2.3