summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drivers/pc80/tpm/Kconfig15
-rw-r--r--src/drivers/pc80/tpm/Makefile.inc8
-rw-r--r--src/security/tpm/Kconfig2
3 files changed, 10 insertions, 15 deletions
diff --git a/src/drivers/pc80/tpm/Kconfig b/src/drivers/pc80/tpm/Kconfig
index 853801b9ab..4a40b2952f 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 0de1b761f6..a16f6afdc4 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 b6a7781d9a..e1255d1680 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