summaryrefslogtreecommitdiff
path: root/src/security
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-04-29 15:33:07 +0300
committerFelix Held <felix-coreboot@felixheld.de>2021-05-26 12:31:10 +0000
commitd2b2a183075ad0c8e3b505541b7055c90a802ded (patch)
tree6d74fde77b86066fff2c19c6a886b1ae410016f6 /src/security
parent0ed04569d7eea07f6649a9bb379d7af0e97bce25 (diff)
Add Kconfig TPM
Defined as TPM1 || TPM2. Change-Id: I18c26d6991c2ccf782a515a8e90a3eb82b53b0e6 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/54853 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/security')
-rw-r--r--src/security/tpm/Kconfig5
-rw-r--r--src/security/vboot/tpm_common.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig
index 13bef06985..96ab2e658f 100644
--- a/src/security/tpm/Kconfig
+++ b/src/security/tpm/Kconfig
@@ -21,6 +21,11 @@ config TPM2
MAINBOARD_HAS_SPI_TPM || \
MAINBOARD_HAS_CRB_TPM
+config TPM
+ bool
+ default y
+ depends on TPM1 || TPM2
+
config MAINBOARD_HAS_TPM1
bool
diff --git a/src/security/vboot/tpm_common.h b/src/security/vboot/tpm_common.h
index 45a7ae999f..7c440f52d2 100644
--- a/src/security/vboot/tpm_common.h
+++ b/src/security/vboot/tpm_common.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#if CONFIG(TPM1) || CONFIG(TPM2)
+#if CONFIG(TPM)
/* Start of the root of trust */
uint32_t vboot_setup_tpm(struct vb2_context *ctx);