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

mb/google/poppy: Change POPPY_USE_* to VARIANT_HAS_* 

Change the prefix for TPM options from POPPY_USE_* to
VARIANT_HAS_*. This makes it clear that these are variant specific
options.

Change-Id: I6fd120a34a5b0c1f018164d5c2b60548da1d0f61
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/22701
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh 2017-12-04 12:36:15 -08:00 committed by Furquan Shaikh
parent f3b97c5a70
commit e7b0dcea7d
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/mainboard/google/poppy/Kconfig
View File

@ -23,15 +23,15 @@ config DEVICETREE
default "variants/baseboard/devicetree.cb"
config DRIVER_TPM_I2C_BUS
depends on POPPY_USE_I2C_TPM
depends on VARIANT_HAS_I2C_TPM
default 0x1
config DRIVER_TPM_I2C_ADDR
depends on POPPY_USE_I2C_TPM
depends on VARIANT_HAS_I2C_TPM
default 0x50
config DRIVER_TPM_SPI_BUS
depends on POPPY_USE_SPI_TPM
depends on VARIANT_HAS_SPI_TPM
default 0x1
config GBB_HWID
@ -72,23 +72,6 @@ config MAX_CPUS
int
default 8
# Select this option to enable use of cr50 I2C TPM on poppy.
config POPPY_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 SPI TPM on poppy.
# This option is disabled by default.
config POPPY_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)
@ -99,23 +82,39 @@ config VARIANT_DIR
default "nautilus" if BOARD_GOOGLE_NAUTILUS
default "soraka" if BOARD_GOOGLE_SORAKA
# Select this option to enable use of cr50 I2C TPM on the variant.
config VARIANT_HAS_I2C_TPM
bool
default n
select I2C_TPM
select MAINBOARD_HAS_I2C_TPM_CR50
select TPM2
# Select this option to enable use of cr50 SPI TPM on the variant.
config VARIANT_HAS_SPI_TPM
bool
default n
select MAINBOARD_HAS_SPI_TPM_CR50
select SPI_TPM
select TPM2
config VARIANT_SPECIFIC_OPTIONS_POPPY
def_bool n
select DRIVERS_I2C_MAX98927
select NO_FADT_8042
select POPPY_USE_I2C_TPM if !VBOOT_MOCK_SECDATA
select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA
config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
def_bool n
select DRIVERS_I2C_DA7219
select DRIVERS_PS2_KEYBOARD
select POPPY_USE_I2C_TPM if !VBOOT_MOCK_SECDATA
select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA
config VARIANT_SPECIFIC_OPTIONS_SORAKA
def_bool n
select DRIVERS_I2C_MAX98927
select NO_FADT_8042
select POPPY_USE_I2C_TPM if !VBOOT_MOCK_SECDATA
select VARIANT_HAS_I2C_TPM if !VBOOT_MOCK_SECDATA
config VBOOT
select EC_GOOGLE_CHROMEEC_SWITCHES