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

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/60061 )

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

mb/google/glados/Kconfig: Select board-specific options per board

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

Change-Id: I70ab37588a6b08a0cc194469fd2642b3cfefe301
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60061
Tested-by: build bot (Jenkins) 
Reviewed-by: Tim Wawrzynczak 
---
M src/mainboard/google/glados/Kconfig
1 file changed, 12 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 6fbbe42..04a48f7 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -13,13 +13,11 @@
    select HAVE_ACPI_TABLES
    select HAVE_OPTION_TABLE
    select HAVE_SPD_IN_CBFS
-	select INTEL_GMA_HAVE_VBT if !BOARD_GOOGLE_GLADOS
    select INTEL_LPSS_UART_FOR_CONSOLE
    select MAINBOARD_HAS_CHROMEOS
    select MAINBOARD_HAS_LIBGFXINIT
    select MAINBOARD_HAS_LPC_TPM
    select MAINBOARD_HAS_TPM1
-	select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS
    select SOC_INTEL_SKYLAKE
    select SYSTEM_TYPE_LAPTOP

@@ -27,11 +25,15 @@
    select BOARD_GOOGLE_BASEBOARD_GLADOS
    select DRIVERS_GENERIC_MAX98357A
    select EXCLUDE_NATIVE_SD_INTERFACE
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_NO_FSP_GOP
    select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS

config BOARD_GOOGLE_CAROLINE
    select BOARD_GOOGLE_BASEBOARD_GLADOS
    select DSAR_ENABLE
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_NO_FSP_GOP
    select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
    select SAR_ENABLE
    select USE_SAR
@@ -39,10 +41,14 @@
 config BOARD_GOOGLE_CAVE
    select BOARD_GOOGLE_BASEBOARD_GLADOS
    select DRIVERS_GENERIC_MAX98357A
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_NO_FSP_GOP
    select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS

config BOARD_GOOGLE_CHELL
    select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_NO_FSP_GOP
    select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS

config BOARD_GOOGLE_GLADOS
@@ -54,11 +60,15 @@
    select BOARD_GOOGLE_BASEBOARD_GLADOS
    select DRIVERS_GENERIC_MAX98357A
    select EXCLUDE_NATIVE_SD_INTERFACE
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_NO_FSP_GOP
    select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS

config BOARD_GOOGLE_SENTRY
    select BOARD_GOOGLE_BASEBOARD_GLADOS
    select DRIVERS_GENERIC_MAX98357A
+	select INTEL_GMA_HAVE_VBT
+	select MAINBOARD_NO_FSP_GOP
    select NHLT_DMIC_4CH if INCLUDE_NHLT_BLOBS
    select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
    select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS