diff --git a/src/cpu/intel/haswell/bootblock.c b/src/cpu/intel/haswell/bootblock.c
index 7066637f24..10da068939 100644
--- a/src/cpu/intel/haswell/bootblock.c
+++ b/src/cpu/intel/haswell/bootblock.c
@@ -52,7 +52,7 @@ static void set_flex_ratio_to_tdp_nominal(void)
 	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 48e529ad9f..526b574611 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -877,7 +877,7 @@ static struct pnp_info pnp_dev_info[] = {
 
 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 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);