Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41872 )
Change subject: drivers/pc80/tpm: Remove LPC_TPM ......................................................................
drivers/pc80/tpm: Remove LPC_TPM
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 kyosti.malkki@gmail.com --- M configs/builder/config.lenovo_t420 M configs/builder/config.lenovo_t420s M configs/builder/config.lenovo_t430s M configs/builder/config.lenovo_t520 M configs/builder/config.lenovo_t530 M configs/builder/config.lenovo_x220 M configs/builder/config.lenovo_x220i M configs/builder/config.lenovo_x230 M src/drivers/pc80/tpm/Kconfig M src/drivers/pc80/tpm/Makefile.inc M src/security/tpm/Kconfig 11 files changed, 10 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/41872/1
diff --git a/configs/builder/config.lenovo_t420 b/configs/builder/config.lenovo_t420 index e4e4b9b..5ac036d 100644 --- a/configs/builder/config.lenovo_t420 +++ b/configs/builder/config.lenovo_t420 @@ -12,7 +12,6 @@ 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 7593b7a..f0b312b 100644 --- a/configs/builder/config.lenovo_t420s +++ b/configs/builder/config.lenovo_t420s @@ -12,7 +12,6 @@ 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 b21dbba..682b17e 100644 --- a/configs/builder/config.lenovo_t430s +++ b/configs/builder/config.lenovo_t430s @@ -12,7 +12,6 @@ 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 1d7816e..4bbbb25 100644 --- a/configs/builder/config.lenovo_t520 +++ b/configs/builder/config.lenovo_t520 @@ -12,7 +12,6 @@ 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 0106bbc..635e355 100644 --- a/configs/builder/config.lenovo_t530 +++ b/configs/builder/config.lenovo_t530 @@ -12,7 +12,6 @@ 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 da5a474..29d9639 100644 --- a/configs/builder/config.lenovo_x220 +++ b/configs/builder/config.lenovo_x220 @@ -12,7 +12,6 @@ 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 5612f5b..24e381d 100644 --- a/configs/builder/config.lenovo_x220i +++ b/configs/builder/config.lenovo_x220i @@ -12,7 +12,6 @@ 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 d897f44..5040145 100644 --- a/configs/builder/config.lenovo_x230 +++ b/configs/builder/config.lenovo_x230 @@ -12,7 +12,6 @@ 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 853801b..4a40b29 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_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 0de1b76..a16f6af 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 b6a7781..e1255d1 100644 --- a/src/security/tpm/Kconfig +++ b/src/security/tpm/Kconfig @@ -82,7 +82,7 @@ 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
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41872 )
Change subject: drivers/pc80/tpm: Remove LPC_TPM ......................................................................
Patch Set 1: Code-Review+1
Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Christian Walter, Michael Niewöhner,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41872
to look at the new patch set (#3).
Change subject: drivers/pc80/tpm: Remove LPC_TPM ......................................................................
drivers/pc80/tpm: Remove LPC_TPM
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 kyosti.malkki@gmail.com --- M configs/builder/config.lenovo_t420 M configs/builder/config.lenovo_t420s M configs/builder/config.lenovo_t430s M configs/builder/config.lenovo_t520 M configs/builder/config.lenovo_t530 M configs/builder/config.lenovo_x220 M configs/builder/config.lenovo_x220i M configs/builder/config.lenovo_x230 M src/drivers/pc80/tpm/Kconfig M src/drivers/pc80/tpm/Makefile.inc M src/security/tpm/Kconfig 11 files changed, 10 insertions(+), 23 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/41872/3
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41872 )
Change subject: drivers/pc80/tpm: Remove LPC_TPM ......................................................................
Patch Set 3: Code-Review+1
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41872 )
Change subject: drivers/pc80/tpm: Remove LPC_TPM ......................................................................
Patch Set 3: Code-Review+2
Philipp Deppenwiese has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41872 )
Change subject: drivers/pc80/tpm: Remove LPC_TPM ......................................................................
drivers/pc80/tpm: Remove LPC_TPM
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 kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/41872 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Michael Niewöhner --- M configs/builder/config.lenovo_t420 M configs/builder/config.lenovo_t420s M configs/builder/config.lenovo_t430s M configs/builder/config.lenovo_t520 M configs/builder/config.lenovo_t530 M configs/builder/config.lenovo_x220 M configs/builder/config.lenovo_x220i M configs/builder/config.lenovo_x230 M src/drivers/pc80/tpm/Kconfig M src/drivers/pc80/tpm/Makefile.inc M src/security/tpm/Kconfig 11 files changed, 10 insertions(+), 23 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved Michael Niewöhner: Looks good to me, but someone else must approve
diff --git a/configs/builder/config.lenovo_t420 b/configs/builder/config.lenovo_t420 index e4e4b9b..5ac036d 100644 --- a/configs/builder/config.lenovo_t420 +++ b/configs/builder/config.lenovo_t420 @@ -12,7 +12,6 @@ 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 7593b7a..f0b312b 100644 --- a/configs/builder/config.lenovo_t420s +++ b/configs/builder/config.lenovo_t420s @@ -12,7 +12,6 @@ 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 b21dbba..682b17e 100644 --- a/configs/builder/config.lenovo_t430s +++ b/configs/builder/config.lenovo_t430s @@ -12,7 +12,6 @@ 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 1d7816e..4bbbb25 100644 --- a/configs/builder/config.lenovo_t520 +++ b/configs/builder/config.lenovo_t520 @@ -12,7 +12,6 @@ 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 0106bbc..635e355 100644 --- a/configs/builder/config.lenovo_t530 +++ b/configs/builder/config.lenovo_t530 @@ -12,7 +12,6 @@ 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 da5a474..29d9639 100644 --- a/configs/builder/config.lenovo_x220 +++ b/configs/builder/config.lenovo_x220 @@ -12,7 +12,6 @@ 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 5612f5b..24e381d 100644 --- a/configs/builder/config.lenovo_x220i +++ b/configs/builder/config.lenovo_x220i @@ -12,7 +12,6 @@ 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 d897f44..5040145 100644 --- a/configs/builder/config.lenovo_x230 +++ b/configs/builder/config.lenovo_x230 @@ -12,7 +12,6 @@ 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 853801b..4a40b29 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_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 0de1b76..a16f6af 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 b6a7781..e1255d1 100644 --- a/src/security/tpm/Kconfig +++ b/src/security/tpm/Kconfig @@ -82,7 +82,7 @@ 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
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)
-
Michael Niewöhner (Code Review)
-
Paul Menzel (Code Review)
-
Philipp Deppenwiese (Code Review)