summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/facebook/fbg1701/board_verified_boot.c4
-rw-r--r--src/mainboard/facebook/fbg1701/manifest.h3
-rw-r--r--src/vendorcode/eltan/security/verified_boot/Kconfig1
3 files changed, 7 insertions, 1 deletions
diff --git a/src/mainboard/facebook/fbg1701/board_verified_boot.c b/src/mainboard/facebook/fbg1701/board_verified_boot.c
index 8b644cbef1..4932964409 100644
--- a/src/mainboard/facebook/fbg1701/board_verified_boot.c
+++ b/src/mainboard/facebook/fbg1701/board_verified_boot.c
@@ -60,6 +60,10 @@ const verify_item_t postcar_verify_list[] = {
* romstage verify list
*/
static const verify_item_t ram_stage_additional_list[] = {
+#if CONFIG(INCLUDE_CONFIG_FILE)
+ { VERIFY_FILE, "config", { { NULL, CBFS_TYPE_RAW } },
+ HASH_IDX_CONFIG, MBOOT_PCR_INDEX_0 },
+#endif
{ VERIFY_FILE, OP_ROM_VBT, { { NULL, CBFS_TYPE_RAW } },
HASH_IDX_OPROM, MBOOT_PCR_INDEX_2 },
#if CONFIG(BMP_LOGO)
diff --git a/src/mainboard/facebook/fbg1701/manifest.h b/src/mainboard/facebook/fbg1701/manifest.h
index b1043546d9..a89de20f0a 100644
--- a/src/mainboard/facebook/fbg1701/manifest.h
+++ b/src/mainboard/facebook/fbg1701/manifest.h
@@ -18,5 +18,6 @@
#define HASH_IDX_DSDT 8
#define HASH_IDX_POSTCAR_STAGE 9
#define HASH_IDX_PUBLICKEY 10
-#define HASH_IDX_BOOTBLOCK 11 /* Should always be the last one */
+#define HASH_IDX_CONFIG 11
+#define HASH_IDX_BOOTBLOCK 12 /* Should always be the last one */
#endif
diff --git a/src/vendorcode/eltan/security/verified_boot/Kconfig b/src/vendorcode/eltan/security/verified_boot/Kconfig
index 7741782650..50638db5c2 100644
--- a/src/vendorcode/eltan/security/verified_boot/Kconfig
+++ b/src/vendorcode/eltan/security/verified_boot/Kconfig
@@ -33,6 +33,7 @@ config VENDORCODE_ELTAN_VBOOT_MANIFEST
config VENDORCODE_ELTAN_OEM_MANIFEST_ITEMS
int "Manifest Items"
+ default 13 if INCLUDE_CONFIG_FILE
default 12
config VENDORCODE_ELTAN_OEM_MANIFEST_ITEM_SIZE