summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorShelley Chen <shchen@google.com>2020-10-16 12:20:16 -0700
committerJulius Werner <jwerner@chromium.org>2020-10-20 23:20:30 +0000
commit9f8ac64baef21dc0be7d1b54c998561dcced0d89 (patch)
tree3a89151812640982d8dd08bf441cf3d73d20227d /src/security
parent9eabeb53abcf2c27ac2286d30859ccdf7556a8bd (diff)
downloadcoreboot-9f8ac64baef21dc0be7d1b54c998561dcced0d89.tar.xz
mrc_cache: Add config MRC_SAVE_HASH_IN_TPM
Use this config to specify whether we want to save a hash of the MRC_CACHE in the TPM NVRAM space. Replace all uses of FSP2_0_USES_TPM_MRC_HASH with MRC_SAVE_HASH_IN_TPM and remove the FSP2_0_USES_TPM_MRC_HASH config. Note that TPM1 platforms will not select MRC_SAVE_HASH_IN_TPM as none of them use FSP2.0 and have recovery MRC_CACHE. BUG=b:150502246 BRANCH=None TEST=emerge-nami coreboot chromeos-bootimage Change-Id: Ic5ffcdba27cb1f09c39c3835029c8d9cc3453af1 Signed-off-by: Shelley Chen <shchen@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46509 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/vboot/Kconfig1
-rw-r--r--src/security/vboot/Makefile.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index ee8d36ae7b..094cbb9642 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -159,6 +159,7 @@ config VBOOT_ALWAYS_ALLOW_UDC
config VBOOT_HAS_REC_HASH_SPACE
bool
+ default y if MRC_SAVE_HASH_IN_TPM && HAS_RECOVERY_MRC_CACHE
default n
help
Set this option to indicate to vboot that recovery data hash space
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index e92396d926..d4dabe2493 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -118,7 +118,7 @@ romstage-y += common.c
ramstage-y += common.c
postcar-y += common.c
-romstage-$(CONFIG_FSP2_0_USES_TPM_MRC_HASH) += mrc_cache_hash_tpm.c
+romstage-$(CONFIG_MRC_SAVE_HASH_IN_TPM) += mrc_cache_hash_tpm.c
ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)