diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2017-04-19 10:19:38 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2017-04-24 22:02:55 +0200 |
| commit | 8bc896f7129b8e47cbca1c15b87a449620186cf8 (patch) | |
| tree | 4310712849d51c4bd9082d07059c27dcd227c46e | |
| parent | fd053d74a3c14a90acbdfa290bd8c1f46ace5009 (diff) | |
Kconfig: provide MAINBOARD_HAS_TPM_CR50 option
The CR50 TPM can do both SPI and I2C communication. However,
there's situations where policy needs to be applied for CR50
generically regardless of the I/O transport. Therefore add
MAINBOARD_HAS_TPM_CR50 to encompass that. Additionally,
once the mainboard has selected CR50 TPM automatically select
MAINBOARD_HAS_TPM2 since CR50 TPM is TPM 2.0.
Change-Id: I878f9b9dc99cfb0252d6fef7fc020fa3d391fcec
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/19370
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/Kconfig | 6 | ||||
| -rw-r--r-- | src/mainboard/google/eve/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/gru/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/reef/Kconfig | 1 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/Kconfig | 2 |
6 files changed, 7 insertions, 5 deletions
diff --git a/src/Kconfig b/src/Kconfig index 7dc738fbd2..a37c26137e 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -402,6 +402,12 @@ config TPM2 If unsure, say N. +config MAINBOARD_HAS_TPM_CR50 + bool + default y if MAINBOARD_HAS_SPI_TPM_CR50 || MAINBOARD_HAS_I2C_TPM_CR50 + default n + select MAINBOARD_HAS_TPM2 + config HEAP_SIZE hex default 0x4000 diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index ccffae50c5..7727a4cad2 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS select I2C_TPM select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_I2C_TPM_CR50 - select MAINBOARD_HAS_TPM2 select MAINBOARD_USES_FSP2_0 select SOC_INTEL_KABYLAKE select TPM2 diff --git a/src/mainboard/google/gru/Kconfig b/src/mainboard/google/gru/Kconfig index feb14c0bcb..0fce7cc167 100644 --- a/src/mainboard/google/gru/Kconfig +++ b/src/mainboard/google/gru/Kconfig @@ -37,7 +37,6 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_NATIVE_VGA_INIT - select MAINBOARD_HAS_TPM2 if GRU_HAS_TPM2 select RAM_CODE_SUPPORT select RTC select SOC_ROCKCHIP_RK3399 diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index a334856351..03ce99b8b9 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -62,7 +62,6 @@ config POPPY_USE_SPI_TPM bool default n select MAINBOARD_HAS_SPI_TPM_CR50 - select MAINBOARD_HAS_TPM2 select SPI_TPM select TPM2 diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index c4bf212d02..8fb6056050 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -14,7 +14,6 @@ config BOARD_GOOGLE_BASEBOARD_REEF select HAVE_ACPI_TABLES select I2C_TPM select MAINBOARD_HAS_CHROMEOS - select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_I2C_TPM_CR50 select TPM2 select GOOGLE_SMBIOS_MAINBOARD_VERSION diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index ab2478212d..1a4ac4fbbe 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -33,7 +33,7 @@ if CHROMEOS config CR50_IMMEDIATELY_COMMIT_FW_SECDATA bool - default y if MAINBOARD_HAS_I2C_TPM_CR50 || MAINBOARD_HAS_SPI_TPM_CR50 + default y if MAINBOARD_HAS_TPM_CR50 config CHROMEOS_RAMOOPS bool "Reserve space for Chrome OS ramoops" |