GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Furquan Shaikh 2018-03-23 10:05:12 -07:00
parent 80d042c467
commit d18f42ab6f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mainboard/google/octopus/Kconfig
View File

@ -10,14 +10,11 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_BOARDID select EC_GOOGLE_CHROMEEC_BOARDID
select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_LPC
select HAS_TPM if !VBOOT_MOCK_SECDATA
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_TPM2
select MAINBOARD_HAS_SPI_TPM_CR50
select SOC_ESPI select SOC_ESPI
select SPI_TPM
select TPM2
if BOARD_GOOGLE_BASEBOARD_OCTOPUS if BOARD_GOOGLE_BASEBOARD_OCTOPUS
@ -63,6 +60,14 @@ config GBB_HWID
default "BIP TEST 5732" if BOARD_GOOGLE_BIP default "BIP TEST 5732" if BOARD_GOOGLE_BIP
default "OCTOPUS TEST 6859" if BOARD_GOOGLE_OCTOPUS 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 config MAX_CPUS
int int
default 4 default 4