GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/facebook/fbg1701: Remove some preprocessor guards 

Change-Id: Ia7289fa8337e1a93e620a52a67ca8cbdd78a66bc
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36633
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Wim Vervoorn <wvervoorn@eltan.com>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
This commit is contained in:
Kyösti Mälkki 2019-11-05 18:20:41 +02:00 committed by Patrick Georgi
parent 07f798d74c
commit dd227a7d97
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mainboard/facebook/fbg1701/board_verified_boot.c
View File

@ -15,7 +15,6 @@
#include "board_verified_boot.h" #include "board_verified_boot.h"
#ifdef __BOOTBLOCK__
/* The items verified by the bootblock, the bootblock will not measure the /* The items verified by the bootblock, the bootblock will not measure the
* items to the TPM * items to the TPM
*/ */
@ -32,9 +31,7 @@ const verify_item_t bootblock_verify_list[] = {
MBOOT_PCR_INDEX_0 }, MBOOT_PCR_INDEX_0 },
{ VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 } { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
}; };
#endif
#if defined(__ROMSTAGE__) || defined(__POSTCAR__)
/* The FSP is already checked in romstage */ /* The FSP is already checked in romstage */
static const verify_item_t ram_stage_additional_list[] = { static const verify_item_t ram_stage_additional_list[] = {
{ VERIFY_FILE, OP_ROM_VBT, { { NULL, CBFS_TYPE_RAW } }, { VERIFY_FILE, OP_ROM_VBT, { { NULL, CBFS_TYPE_RAW } },
@ -45,9 +42,7 @@ static const verify_item_t ram_stage_additional_list[] = {
HASH_IDX_DSDT, MBOOT_PCR_INDEX_2 }, HASH_IDX_DSDT, MBOOT_PCR_INDEX_2 },
{ VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 } { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
}; };
#endif
#ifdef __ROMSTAGE__
/* The items used by the romstage */ /* The items used by the romstage */
const verify_item_t romstage_verify_list[] = { const verify_item_t romstage_verify_list[] = {
{ VERIFY_FILE, ROMSTAGE, { { NULL, CBFS_TYPE_STAGE } }, { VERIFY_FILE, ROMSTAGE, { { NULL, CBFS_TYPE_STAGE } },
@ -75,10 +70,8 @@ const verify_item_t ramstage_verify_list[] = {
CBFS_TYPE_STAGE } }, HASH_IDX_RAM_STAGE, MBOOT_PCR_INDEX_0 }, CBFS_TYPE_STAGE } }, HASH_IDX_RAM_STAGE, MBOOT_PCR_INDEX_0 },
{ VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 } { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
}; };
#endif
#ifdef __POSTCAR__ /* POSTCAR */
/* POSTSTAGE */
/* The items used by the postcar stage */ /* The items used by the postcar stage */
const verify_item_t postcar_verify_list[] = { const verify_item_t postcar_verify_list[] = {
{ VERIFY_FILE, RAMSTAGE, { { ram_stage_additional_list, { VERIFY_FILE, RAMSTAGE, { { ram_stage_additional_list,
@ -91,9 +84,7 @@ const verify_item_t postcar_verify_list[] = {
MBOOT_PCR_INDEX_1 }, MBOOT_PCR_INDEX_1 },
{ VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 } { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
}; };
#endif
#ifdef __RAMSTAGE__
/* RAMSTAGE */ /* RAMSTAGE */
const verify_item_t payload_verify_list[] = { const verify_item_t payload_verify_list[] = {
{ VERIFY_FILE, PAYLOAD, { { NULL, CBFS_TYPE_SELF | { VERIFY_FILE, PAYLOAD, { { NULL, CBFS_TYPE_SELF |
@ -105,4 +96,3 @@ const verify_item_t payload_verify_list[] = {
const verify_item_t oprom_verify_list[] = { const verify_item_t oprom_verify_list[] = {
{ VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 } { VERIFY_TERMINATOR, NULL, { { NULL, 0 } }, 0, 0 }
}; };
#endif