From d18f42ab6f5e166084da42f237690b5836854456 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 23 Mar 2018 10:05:12 -0700 Subject: mb/google/octopus: Select TPM options only if mocktpm is not selected This change adds a new Kconfig option for mainboard octopus "HAS_TPM" that auto-selects all TPM related options only if VBOOT_MOCK_SECDATA is not selected. BUG=b:76203913 TEST=Compiles fine with mocktpm. Change-Id: Ib28fc47a70be58cd9a9ec65ce3b1cda68d558437 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/25340 Reviewed-by: Aaron Durbin Reviewed-by: Justin TerAvest Reviewed-by: Jett Rink Tested-by: build bot (Jenkins) --- src/mainboard/google/octopus/Kconfig | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/mainboard/google/octopus') diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 0e58215e2a..60c98c0974 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -10,14 +10,11 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_LPC + select HAS_TPM if !VBOOT_MOCK_SECDATA select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select MAINBOARD_HAS_CHROMEOS - select MAINBOARD_HAS_TPM2 - select MAINBOARD_HAS_SPI_TPM_CR50 select SOC_ESPI - select SPI_TPM - select TPM2 if BOARD_GOOGLE_BASEBOARD_OCTOPUS @@ -63,6 +60,14 @@ config GBB_HWID default "BIP TEST 5732" if BOARD_GOOGLE_BIP default "OCTOPUS TEST 6859" if BOARD_GOOGLE_OCTOPUS +config HAS_TPM + bool + default n + select MAINBOARD_HAS_SPI_TPM_CR50 + select MAINBOARD_HAS_TPM2 + select SPI_TPM + select TPM2 + config MAX_CPUS int default 4 -- cgit v1.2.3