summaryrefslogtreecommitdiff
path: root/src/security/vboot
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-05-27 19:33:57 +0300
committerPatrick Georgi <pgeorgi@google.com>2021-05-30 20:14:47 +0000
commitf303b4ffd92caf479153245a720c79eca5edb4ba (patch)
tree8d8fcd4e52e6a04a6445ea77f2175425dec7fac2 /src/security/vboot
parentde77449c3946e89140fe53ca636d77a23ccc503c (diff)
Apply more uses for Kconfig TPM
Change-Id: I54b296563940cd46fe9da9fe789b746f2fc1987d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/55016 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Diffstat (limited to 'src/security/vboot')
-rw-r--r--src/security/vboot/Kconfig2
-rw-r--r--src/security/vboot/Makefile.inc4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig
index 515efc7bef..036875884b 100644
--- a/src/security/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -13,7 +13,7 @@ config VBOOT
bool "Verify firmware with vboot."
default n
select VBOOT_LIB
- select VBOOT_MOCK_SECDATA if !TPM1 && !TPM2
+ select VBOOT_MOCK_SECDATA if !TPM
depends on 0 = 0 # Must have a 'depends on' or board overrides will break it.
help
Enabling VBOOT will use vboot to verify the components of the firmware
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 668d3d9dd5..47830f3c62 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -109,9 +109,7 @@ romstage-y += secdata_tpm.c
ramstage-y += secdata_tpm.c
endif
-ifneq ($(CONFIG_TPM1)$(CONFIG_TPM2),)
-verstage-y += tpm_common.c
-endif
+verstage-$(CONFIG_TPM) += tpm_common.c
romstage-y += common.c