Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/25340
Change subject: mb/google/octopus: Select TPM options only if mocktpm is not selected ......................................................................
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 furquan@google.com --- M src/mainboard/google/octopus/Kconfig 1 file changed, 9 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/25340/1
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 0e58215..60c98c0 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -10,14 +10,11 @@ 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 @@ 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