diff options
| author | Jes B. Klinke <jbk@chromium.org> | 2022-04-19 14:00:33 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2022-04-21 23:07:20 +0000 |
| commit | c6b041a12e56f32be37b809357225e762b070117 (patch) | |
| tree | df09f63531c43eb3c7b8f3727d3726ccdaed035a /src/drivers/pc80 | |
| parent | 0b71099f6587e9722e4554c094e5ef1c32195860 (diff) | |
| download | coreboot-c6b041a12e56f32be37b809357225e762b070117.tar.gz coreboot-c6b041a12e56f32be37b809357225e762b070117.tar.bz2 coreboot-c6b041a12e56f32be37b809357225e762b070117.zip | |
tpm: Refactor TPM Kconfig dimensions
Break TPM related Kconfig into the following dimensions:
TPM transport support:
config CRB_TPM
config I2C_TPM
config SPI_TPM
config MEMORY_MAPPED_TPM (new)
TPM brand, not defining any of these is valid, and result in "generic" support:
config TPM_ATMEL (new)
config TPM_GOOGLE (new)
config TPM_GOOGLE_CR50 (new, implies TPM_GOOGLE)
config TPM_GOOGLE_TI50 (new to be used later, implies TPM_GOOGLE)
What protocol the TPM chip supports:
config MAINBOARD_HAS_TPM1
config MAINBOARD_HAS_TPM2
What the user chooses to compile (restricted by the above):
config NO_TPM
config TPM1
config TPM2
The following Kconfigs will be replaced as indicated:
config TPM_CR50 -> TPM_GOOGLE
config MAINBOARD_HAS_CRB_TPM -> CRB_TPM
config MAINBOARD_HAS_I2C_TPM_ATMEL -> I2C_TPM && TPM_ATMEL
config MAINBOARD_HAS_I2C_TPM_CR50 -> I2C_TPM && TPM_GOOGLE
config MAINBOARD_HAS_I2C_TPM_GENERIC -> I2C_TPM && !TPM_GOOGLE && !TPM_ATMEL
config MAINBOARD_HAS_LPC_TPM -> MEMORY_MAPPED_TPM
config MAINBOARD_HAS_SPI_TPM -> SPI_TPM && !TPM_GOOGLE && !TPM_ATMEL
config MAINBOARD_HAS_SPI_TPM_CR50 -> SPI_TPM && TPM_GOOGLE
Signed-off-by: Jes B. Klinke <jbk@chromium.org>
Change-Id: I4656b2b90363b8dfd008dc281ad591862fe2cc9e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63424
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/drivers/pc80')
| -rw-r--r-- | src/drivers/pc80/tpm/Kconfig | 6 | ||||
| -rw-r--r-- | src/drivers/pc80/tpm/Makefile.inc | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/drivers/pc80/tpm/Kconfig b/src/drivers/pc80/tpm/Kconfig index 4a40b2952f26..94920dfc6367 100644 --- a/src/drivers/pc80/tpm/Kconfig +++ b/src/drivers/pc80/tpm/Kconfig @@ -1,10 +1,10 @@ -config MAINBOARD_HAS_LPC_TPM +config MEMORY_MAPPED_TPM bool default n help - Board has LPC TPM support + Board has memory mapped TPM support -if MAINBOARD_HAS_LPC_TPM +if MEMORY_MAPPED_TPM config TPM_TIS_BASE_ADDRESS hex diff --git a/src/drivers/pc80/tpm/Makefile.inc b/src/drivers/pc80/tpm/Makefile.inc index 8b2a864ecbfc..859233712bc2 100644 --- a/src/drivers/pc80/tpm/Makefile.inc +++ b/src/drivers/pc80/tpm/Makefile.inc @@ -1,5 +1,3 @@ -bootblock-$(CONFIG_MAINBOARD_HAS_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 +ifeq ($(CONFIG_MEMORY_MAPPED_TPM),y) +all-y += tis.c +endif |