From eca98ba46051d5e2091ac4ad29b053321f06ff73 Mon Sep 17 00:00:00 2001 From: Shelley Chen Date: Wed, 22 Nov 2017 17:31:40 -0800 Subject: google/fizz: Remove tpm i2c configs from Kconfig We are disabling tpm over i2c, so the configs are not needed anymore. BUG=b:65056998 BRANCH=None TEST=emerge fizz and make sure can still boot up. Change-Id: Id88f32fa952801749544534442fc15d85fc1a892 Signed-off-by: Shelley Chen Reviewed-on: https://review.coreboot.org/22577 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/fizz/Kconfig | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'src/mainboard/google/fizz/Kconfig') diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index b1f353d53d..ce5c8bdd04 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -15,7 +15,9 @@ config BOARD_SPECIFIC_OPTIONS select MAINBOARD_USES_FSP2_0 select NO_FADT_8042 select SOC_INTEL_KABYLAKE - select FIZZ_USE_SPI_TPM + select MAINBOARD_HAS_SPI_TPM_CR50 + select SPI_TPM + select TPM2 select GENERIC_SPD_BIN select RT8168_GET_MAC_FROM_VPD select RT8168_SET_LED_MODE @@ -29,16 +31,7 @@ config VBOOT select HAS_RECOVERY_MRC_CACHE select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN -config DRIVER_TPM_I2C_BUS - depends on FIZZ_USE_I2C_TPM - default 0x1 - -config DRIVER_TPM_I2C_ADDR - depends on FIZZ_USE_I2C_TPM - default 0x50 - config DRIVER_TPM_SPI_BUS - depends on FIZZ_USE_SPI_TPM default 0x1 config GBB_HWID @@ -70,22 +63,6 @@ config DIMM_SPD_SIZE int default 512 -# Select this option to enable use of cr50 I2C TPM on fizz. -config FIZZ_USE_I2C_TPM - bool - default n - select I2C_TPM - select MAINBOARD_HAS_I2C_TPM_CR50 - select TPM2 - -# Select this option to enable use of cr50 I2C TPM on fizz. -config FIZZ_USE_SPI_TPM - bool - default n - select MAINBOARD_HAS_SPI_TPM_CR50 - select SPI_TPM - select TPM2 - config TPM_TIS_ACPI_INTERRUPT int default 64 # GPE0_DW2_00 (GPP_E0) -- cgit v1.2.3