From 542cffacbb69e83397579a59e88f93d422cb26a0 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 29 May 2020 19:42:07 +0300 Subject: drivers/pc80/tpm: Remove LPC_TPM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace uses with MAINBOARD_HAS_LPC_TPM, if drivers/pc80/tpm is present in devicetree.cb it is necessary to always include the driver in the build. Change-Id: I9ab921ab70f7b527a52fbf5f775aa063d9a706ce Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/41872 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Angel Pons Reviewed-by: Michael Niewöhner --- src/drivers/pc80/tpm/Kconfig | 15 +++++---------- src/drivers/pc80/tpm/Makefile.inc | 8 ++++---- 2 files changed, 9 insertions(+), 14 deletions(-) (limited to 'src/drivers/pc80') 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 -- cgit v1.2.3