11 files changed, 10 insertions, 23 deletions

diff --git a/configs/builder/config.lenovo_t420 b/configs/builder/config.lenovo_t420
index e4e4b9b2a47f..5ac036d98d8d 100644
--- a/configs/builder/config.lenovo_t420
+++ b/configs/builder/config.lenovo_t420
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/configs/builder/config.lenovo_t420s b/configs/builder/config.lenovo_t420s
index 7593b7a7405d..f0b312b42ef2 100644
--- a/configs/builder/config.lenovo_t420s
+++ b/configs/builder/config.lenovo_t420s
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/configs/builder/config.lenovo_t430s b/configs/builder/config.lenovo_t430s
index b21dbbaf07a4..682b17eb2a81 100644
--- a/configs/builder/config.lenovo_t430s
+++ b/configs/builder/config.lenovo_t430s
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/configs/builder/config.lenovo_t520 b/configs/builder/config.lenovo_t520
index 1d7816e90939..4bbbb255b87e 100644
--- a/configs/builder/config.lenovo_t520
+++ b/configs/builder/config.lenovo_t520
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/configs/builder/config.lenovo_t530 b/configs/builder/config.lenovo_t530
index 0106bbc22a30..635e3554c925 100644
--- a/configs/builder/config.lenovo_t530
+++ b/configs/builder/config.lenovo_t530
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/configs/builder/config.lenovo_x220 b/configs/builder/config.lenovo_x220
index da5a4742777a..29d9639bd9b1 100644
--- a/configs/builder/config.lenovo_x220
+++ b/configs/builder/config.lenovo_x220
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/configs/builder/config.lenovo_x220i b/configs/builder/config.lenovo_x220i
index 5612f5b22e46..24e381d12ce4 100644
--- a/configs/builder/config.lenovo_x220i
+++ b/configs/builder/config.lenovo_x220i
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/configs/builder/config.lenovo_x230 b/configs/builder/config.lenovo_x230
index d897f44ec830..5040145aac17 100644
--- a/configs/builder/config.lenovo_x230
+++ b/configs/builder/config.lenovo_x230
@@ -12,7 +12,6 @@ CONFIG_NO_POST=y
 CONFIG_GBE_BIN_PATH="site-local/gbe.bin"
 CONFIG_PCIEXP_CLK_PM=y
 CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_LPC_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
 CONFIG_PAYLOAD_NONE=y
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
diff --git a/src/drivers/pc80/tpm/Kconfig b/src/drivers/pc80/tpm/Kconfig
index 853801b9abe6..4a40b2952f26 100644
--- a/src/drivers/pc80/tpm/Kconfig
+++ b/src/drivers/pc80/tpm/Kconfig
@@ -1,13 +1,14 @@
-config LPC_TPM
+config MAINBOARD_HAS_LPC_TPM
 	bool
 	default n
 	help
-	  LPC TPM driver is enabled!
+	  Board has LPC TPM support
+
+if MAINBOARD_HAS_LPC_TPM
 
 config TPM_TIS_BASE_ADDRESS
 	hex
 	default 0xfed40000
-	depends on LPC_TPM
 	help
 	  This can be used to adjust the TPM memory base address.
 	  The default is specified by the TCG PC Client Specific TPM
@@ -17,14 +18,8 @@ config TPM_TIS_BASE_ADDRESS
 config TPM_PIRQ
 	hex
 	default 0x0
-	depends on LPC_TPM
 	help
 	  This can be used to specify a PIRQ to use instead of SERIRQ,
 	  which is needed for SPI TPM interrupt support on x86.
 
-config MAINBOARD_HAS_LPC_TPM
-	bool
-	default n
-	select LPC_TPM
-	help
-	  Board has LPC TPM support
+endif
diff --git a/src/drivers/pc80/tpm/Makefile.inc b/src/drivers/pc80/tpm/Makefile.inc
index 0de1b761f6ca..a16f6afdc4cd 100644
--- a/src/drivers/pc80/tpm/Makefile.inc
+++ b/src/drivers/pc80/tpm/Makefile.inc
@@ -1,4 +1,4 @@
-verstage-$(CONFIG_LPC_TPM) += tis.c
-romstage-$(CONFIG_LPC_TPM) += tis.c
-ramstage-$(CONFIG_LPC_TPM) += tis.c
-postcar-$(CONFIG_LPC_TPM) += tis.c
+verstage-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
+romstage-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
+ramstage-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
+postcar-$(CONFIG_MAINBOARD_HAS_LPC_TPM) += tis.c
diff --git a/src/security/tpm/Kconfig b/src/security/tpm/Kconfig
index b6a7781d9ab9..e1255d1680de 100644
--- a/src/security/tpm/Kconfig
+++ b/src/security/tpm/Kconfig
@@ -82,7 +82,7 @@ config DEBUG_TPM
 config TPM_RDRESP_NEED_DELAY
 	bool "Enable Delay Workaround for TPM"
 	default n
-	depends on LPC_TPM
+	depends on MAINBOARD_HAS_LPC_TPM
 	help
 	  Certain TPMs seem to need some delay when reading response
 	  to work around a race-condition-related issue, possibly