diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-05-25 06:45:08 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-02 07:27:41 +0000 |
| commit | ad2eb28c10652ee5ad5a899ff1ff8805c43fd5ab (patch) | |
| tree | 4c54599fb54431067137a2a73d4947032c82f325 | |
| parent | 9657fc2bd95955b22b5b4fb19e1a98d632f1887a (diff) | |
mb/facebook/fbg1701: Remove C_ENV_BOOTBLOCK_SIZE
Remove the use of C_ENV_BOOTBLOCK_SIZE. Verify the bootblock by reading
the CBFS file instead of directly accessing the datablock.
BUG=None
BRANCH=None
TEST=tested on facebook fbg1701
Change-Id: I4254d681525327c7eec18832586818e9c4e8eb22
Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41694
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/facebook/fbg1701/board_verified_boot.c | 12 | ||||
| -rw-r--r-- | src/mainboard/facebook/fbg1701/board_verified_boot.h | 1 |
2 files changed, 5 insertions, 8 deletions
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" |