From d22d692a19931a9752c85e7d5cd41308807de88e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Thu, 16 Dec 2021 01:55:43 +0100 Subject: [PATCH] mb/google/poppy: Select board-specific options per board Move board-specific selects out of common configuration and add them to each board where necessary. Change-Id: I5bda94b20da4c9184cef2a39598e25a214c044b1 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/60146 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/poppy/Kconfig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index b938ed75c2..4a19f865b3 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -11,7 +11,6 @@ config BOARD_GOOGLE_BASEBOARD_POPPY select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_SPD_IN_CBFS - select INTEL_GMA_HAVE_VBT if !BOARD_GOOGLE_POPPY select INTEL_LPSS_UART_FOR_CONSOLE select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_TPM2 @@ -26,6 +25,7 @@ config BOARD_GOOGLE_ATLAS select DRIVERS_USB_ACPI select EXCLUDE_NATIVE_SD_INTERFACE select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR + select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_SPI_TPM_CR50 select SYSTEM_TYPE_LAPTOP @@ -46,6 +46,7 @@ config BOARD_GOOGLE_NAMI select DRIVERS_I2C_DA7219 select DRIVERS_SPI_ACPI select EXCLUDE_NATIVE_SD_INTERFACE + select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_SPI_TPM_CR50 select SYSTEM_TYPE_LAPTOP @@ -54,6 +55,7 @@ config BOARD_GOOGLE_NAUTILUS select CHROMEOS_WIFI_SAR if CHROMEOS select DRIVERS_GENERIC_MAX98357A select DRIVERS_I2C_DA7219 + select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_I2C_TPM_CR50 select SYSTEM_TYPE_CONVERTIBLE select VARIANT_HAS_CAMERA_ACPI @@ -68,6 +70,7 @@ config BOARD_GOOGLE_NOCTURNE select DRIVERS_USB_ACPI select EXCLUDE_NATIVE_SD_INTERFACE select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR + select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_SPI_TPM_CR50 select NO_FADT_8042 select SYSTEM_TYPE_DETACHABLE @@ -80,6 +83,7 @@ config BOARD_GOOGLE_RAMMUS select DRIVERS_I2C_MAX98927 select DRIVERS_SPI_ACPI select DRIVERS_USB_ACPI + select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_SPI_TPM_CR50 select SYSTEM_TYPE_LAPTOP @@ -87,6 +91,7 @@ config BOARD_GOOGLE_RAMMUS config BOARD_GOOGLE_SORAKA select BOARD_GOOGLE_BASEBOARD_POPPY select DRIVERS_I2C_MAX98927 + select INTEL_GMA_HAVE_VBT select MAINBOARD_HAS_I2C_TPM_CR50 select NO_FADT_8042 select SYSTEM_TYPE_DETACHABLE