[coreboot-gerrit] Change in coreboot[master]: mb/google/volteer: Select board-specific options per board

[Felix Singer (Code Review)]

Attention is currently required from: Tim Wawrzynczak, Nick Vaccaro.
 Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60370 )

Change subject: mb/google/volteer: Select board-specific options per board
......................................................................

mb/google/volteer: Select board-specific options per board

Move board-specific selects out of common configuration and add them to
each board where necessary.

Change-Id: I6c5305a764b7a362f9f381580a1cd2c20a8f2e9d
Signed-off-by: Felix Singer 
---
M src/mainboard/google/volteer/Kconfig
1 file changed, 19 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/60370/1

diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index ced8d9d..df2d4a5 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -28,8 +28,6 @@
    select HAVE_SPD_IN_CBFS
    select INTEL_LPSS_UART_FOR_CONSOLE
    select MAINBOARD_HAS_CHROMEOS
-	select MAINBOARD_HAS_I2C_TPM_CR50 if BOARD_GOOGLE_VOLTEER2_TI50
-	select MAINBOARD_HAS_SPI_TPM_CR50 if !BOARD_GOOGLE_VOLTEER2_TI50
    select MAINBOARD_HAS_TPM2
    select SOC_INTEL_COMMON_BLOCK_TCSS
    select SOC_INTEL_CSE_LITE_SKU
@@ -38,13 +36,16 @@
 config BOARD_GOOGLE_DELBIN
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select DRIVERS_GENESYSLOGIC_GL9755
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_ELDRID
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_HALVOR
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select INTEL_CAR_NEM
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_LINDAR
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
@@ -52,25 +53,31 @@
    select DRIVERS_GENERIC_BAYHUB_LV2
    select DRIVERS_I2C_RT1011
    select INTEL_CAR_NEM
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_MALEFOR
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select INTEL_CAR_NEM
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_TERRADOR
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_TODOR
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select INTEL_CAR_NEM
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_TRONDO
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select INTEL_CAR_NEM
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_VOLTEER
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select INTEL_CAR_NEM
+	select MAINBOARD_HAS_SPI_TPM_CR50
    select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
    select VARIANT_HAS_MIPI_CAMERA

@@ -78,6 +85,7 @@
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select DRIVER_I2C_TPM_ACPI
    select DRIVERS_GENESYSLOGIC_GL9755
+	select MAINBOARD_HAS_SPI_TPM_CR50
    select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
    select VARIANT_HAS_MIPI_CAMERA

@@ -85,6 +93,7 @@
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select DRIVER_I2C_TPM_ACPI
    select DRIVERS_GENESYSLOGIC_GL9755
+	select MAINBOARD_HAS_I2C_TPM_CR50
    select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
    select VARIANT_HAS_MIPI_CAMERA

@@ -92,31 +101,39 @@
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
    select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_ELEMI
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_VOEMA
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50
    select VARIANT_HAS_MIPI_CAMERA

config BOARD_GOOGLE_DROBIT
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
    select DRIVERS_GENESYSLOGIC_GL9755
+	select MAINBOARD_HAS_SPI_TPM_CR50
    select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES

config BOARD_GOOGLE_COPANO
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50
    select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES

config BOARD_GOOGLE_COLLIS
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_VOLET
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50

config BOARD_GOOGLE_CHRONICLER
    select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select MAINBOARD_HAS_SPI_TPM_CR50

if BOARD_GOOGLE_BASEBOARD_VOLTEER