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/mainboard/google/poppy/Kconfig | |
| parent | 0b71099f6587e9722e4554c094e5ef1c32195860 (diff) | |
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/mainboard/google/poppy/Kconfig')
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 4032f57d01..3007bcbc9a 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -14,6 +14,7 @@ config BOARD_GOOGLE_BASEBOARD_POPPY select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_TPM2 select SOC_INTEL_KABYLAKE + select TPM_GOOGLE_CR50 config BOARD_GOOGLE_ATLAS select BOARD_GOOGLE_BASEBOARD_POPPY @@ -26,14 +27,14 @@ config BOARD_GOOGLE_ATLAS select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_HAS_SPI_TPM_CR50 + select SPI_TPM select SYSTEM_TYPE_LAPTOP select VARIANT_HAS_CAMERA_ACPI config BOARD_GOOGLE_POPPY select BOARD_GOOGLE_BASEBOARD_POPPY select DRIVERS_I2C_MAX98927 - select MAINBOARD_HAS_I2C_TPM_CR50 + select I2C_TPM select NO_FADT_8042 select SYSTEM_TYPE_LAPTOP select VARIANT_HAS_CAMERA_ACPI @@ -46,7 +47,7 @@ config BOARD_GOOGLE_NAMI select DRIVERS_SPI_ACPI select EXCLUDE_NATIVE_SD_INTERFACE select INTEL_GMA_HAVE_VBT - select MAINBOARD_HAS_SPI_TPM_CR50 + select SPI_TPM select SYSTEM_TYPE_LAPTOP config BOARD_GOOGLE_NAUTILUS @@ -54,8 +55,8 @@ config BOARD_GOOGLE_NAUTILUS select CHROMEOS_WIFI_SAR if CHROMEOS select DRIVERS_GENERIC_MAX98357A select DRIVERS_I2C_DA7219 + select I2C_TPM select INTEL_GMA_HAVE_VBT - select MAINBOARD_HAS_I2C_TPM_CR50 select SYSTEM_TYPE_CONVERTIBLE select VARIANT_HAS_CAMERA_ACPI @@ -70,8 +71,8 @@ config BOARD_GOOGLE_NOCTURNE select EXCLUDE_NATIVE_SD_INTERFACE select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR select INTEL_GMA_HAVE_VBT - select MAINBOARD_HAS_SPI_TPM_CR50 select NO_FADT_8042 + select SPI_TPM select SYSTEM_TYPE_DETACHABLE select VARIANT_HAS_CAMERA_ACPI @@ -84,14 +85,14 @@ config BOARD_GOOGLE_RAMMUS select DRIVERS_USB_ACPI select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_LIBGFXINIT - select MAINBOARD_HAS_SPI_TPM_CR50 + select SPI_TPM select SYSTEM_TYPE_LAPTOP config BOARD_GOOGLE_SORAKA select BOARD_GOOGLE_BASEBOARD_POPPY select DRIVERS_I2C_MAX98927 + select I2C_TPM select INTEL_GMA_HAVE_VBT - select MAINBOARD_HAS_I2C_TPM_CR50 select NO_FADT_8042 select SYSTEM_TYPE_DETACHABLE select VARIANT_HAS_CAMERA_ACPI @@ -118,15 +119,15 @@ config DEVICETREE default "variants/baseboard/devicetree.cb" config DRIVER_TPM_I2C_BUS - depends on MAINBOARD_HAS_I2C_TPM_CR50 + depends on I2C_TPM default 0x1 config DRIVER_TPM_I2C_ADDR - depends on MAINBOARD_HAS_I2C_TPM_CR50 + depends on I2C_TPM default 0x50 config DRIVER_TPM_SPI_BUS - depends on MAINBOARD_HAS_SPI_TPM_CR50 + depends on SPI_TPM default 0x1 config INCLUDE_NHLT_BLOBS |