diff options
| author | Furquan Shaikh <furquan@google.com> | 2018-03-23 10:05:12 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2018-03-24 05:17:07 +0000 |
| commit | d18f42ab6f5e166084da42f237690b5836854456 (patch) | |
| tree | bbc06b9a3f64c3c4ddcc752ada5d48c2f4092b70 | |
| parent | 80d042c4674276e8dfc011ee8755e4c3eaf3e176 (diff) | |
| download | coreboot-d18f42ab6f5e166084da42f237690b5836854456.tar.xz | |
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>
Reviewed-on: https://review.coreboot.org/25340
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Jett Rink <jettrink@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/google/octopus/Kconfig | 13 |
1 files changed, 9 insertions, 4 deletions
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 |