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>
diff --git a/src/cpu/intel/haswell/bootblock.c b/src/cpu/intel/haswell/bootblock.c
index 7066637..10da068 100644
--- a/src/cpu/intel/haswell/bootblock.c
+++ b/src/cpu/intel/haswell/bootblock.c
@@ -52,7 +52,7 @@
RCBA32_OR(SOFT_RESET_CTRL, 1);
/* Delay before reset to avoid potential TPM lockout */
- if (CONFIG(TPM1) || CONFIG(TPM2))
+ if (CONFIG(TPM))
mdelay(30);
/* Issue warm reset, will be "CPU only" due to soft reset data */
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index 48e529a..526b574 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -877,7 +877,7 @@
static void enable_dev(struct device *dev)
{
- if (CONFIG(TPM1) || CONFIG(TPM2))
+ if (CONFIG(TPM))
pnp_enable_devices(dev, &lpc_tpm_ops,
ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
}
diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig
index 13bef06..96ab2e6 100644
--- a/src/security/tpm/Kconfig
+++ b/src/security/tpm/Kconfig
@@ -21,6 +21,11 @@
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 45a7ae9..7c440f5 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);