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)
This commit is contained in:
Aaron Durbin 2017-04-19 10:19:38 -05:00
parent fd053d74a3
commit 8bc896f712
6 changed files with 7 additions and 5 deletions

View File

@ -402,6 +402,12 @@ config TPM2
If unsure, say N. 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 config HEAP_SIZE
hex hex
default 0x4000 default 0x4000

View File

@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS
select I2C_TPM select I2C_TPM
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_I2C_TPM_CR50 select MAINBOARD_HAS_I2C_TPM_CR50
select MAINBOARD_HAS_TPM2
select MAINBOARD_USES_FSP2_0 select MAINBOARD_USES_FSP2_0
select SOC_INTEL_KABYLAKE select SOC_INTEL_KABYLAKE
select TPM2 select TPM2

View File

@ -37,7 +37,6 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_HAS_TPM2 if GRU_HAS_TPM2
select RAM_CODE_SUPPORT select RAM_CODE_SUPPORT
select RTC select RTC
select SOC_ROCKCHIP_RK3399 select SOC_ROCKCHIP_RK3399

View File

@ -62,7 +62,6 @@ config POPPY_USE_SPI_TPM
bool bool
default n default n
select MAINBOARD_HAS_SPI_TPM_CR50 select MAINBOARD_HAS_SPI_TPM_CR50
select MAINBOARD_HAS_TPM2
select SPI_TPM select SPI_TPM
select TPM2 select TPM2

View File

@ -14,7 +14,6 @@ config BOARD_GOOGLE_BASEBOARD_REEF
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select I2C_TPM select I2C_TPM
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_TPM2
select MAINBOARD_HAS_I2C_TPM_CR50 select MAINBOARD_HAS_I2C_TPM_CR50
select TPM2 select TPM2
select GOOGLE_SMBIOS_MAINBOARD_VERSION select GOOGLE_SMBIOS_MAINBOARD_VERSION

View File

@ -33,7 +33,7 @@ if CHROMEOS
config CR50_IMMEDIATELY_COMMIT_FW_SECDATA config CR50_IMMEDIATELY_COMMIT_FW_SECDATA
bool bool
default y if MAINBOARD_HAS_I2C_TPM_CR50 || MAINBOARD_HAS_SPI_TPM_CR50 default y if MAINBOARD_HAS_TPM_CR50
config CHROMEOS_RAMOOPS config CHROMEOS_RAMOOPS
bool "Reserve space for Chrome OS ramoops" bool "Reserve space for Chrome OS ramoops"