Angel Pons has uploaded this change for review.

View Change

mb/google/poppy: Drop VARIANT_SPECIFIC_OPTIONS_*

Putting variant-specific options in Kconfig.name seems to be what is
popular now, so we might as well do the same for Poppy.

Change-Id: I8ce3237ac620c26856b6cf3d08293729641dd0b0
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
---
M src/mainboard/google/poppy/Kconfig
M src/mainboard/google/poppy/Kconfig.name
2 files changed, 49 insertions(+), 77 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/42144/1

diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 8553821..4298950 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -134,76 +134,6 @@
 	bool
 	default n
 
-config VARIANT_SPECIFIC_OPTIONS_ATLAS
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_MAX98373
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_SPI_ACPI
-	select DRIVERS_USB_ACPI
-	select EXCLUDE_NATIVE_SD_INTERFACE
-	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_SPI_TPM_CR50
-	select VARIANT_HAS_CAMERA_ACPI
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-
-config VARIANT_SPECIFIC_OPTIONS_POPPY
-	def_bool n
-	select DRIVERS_I2C_MAX98927
-	select NO_FADT_8042
-	select VARIANT_HAS_CAMERA_ACPI
-	select MAINBOARD_HAS_I2C_TPM_CR50
-
-config VARIANT_SPECIFIC_OPTIONS_NAMI
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_SPI_ACPI
-	select EXCLUDE_NATIVE_SD_INTERFACE
-	select MAINBOARD_HAS_SPI_TPM_CR50
-
-config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
-	select VARIANT_HAS_CAMERA_ACPI
-	select MAINBOARD_HAS_I2C_TPM_CR50
-
-config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_SX9310 if CHROMEOS_WIFI_SAR
-	select DRIVERS_I2C_MAX98373
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_SPI_ACPI
-	select DRIVERS_USB_ACPI
-	select EXCLUDE_NATIVE_SD_INTERFACE
-	select MAINBOARD_HAS_SPI_TPM_CR50
-	select NO_FADT_8042
-	select SYSTEM_TYPE_DETACHABLE
-	select VARIANT_HAS_CAMERA_ACPI
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-
-config VARIANT_SPECIFIC_OPTIONS_RAMMUS
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_MAX98927
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_SPI_ACPI
-	select DRIVERS_USB_ACPI
-	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_SPI_TPM_CR50
-
-config VARIANT_SPECIFIC_OPTIONS_SORAKA
-	def_bool n
-	select DRIVERS_I2C_MAX98927
-	select NO_FADT_8042
-	select SYSTEM_TYPE_DETACHABLE
-	select VARIANT_HAS_CAMERA_ACPI
-	select MAINBOARD_HAS_I2C_TPM_CR50
-
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select HAS_RECOVERY_MRC_CACHE
diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name
index 9ecdb44..cf8d2c1 100644
--- a/src/mainboard/google/poppy/Kconfig.name
+++ b/src/mainboard/google/poppy/Kconfig.name
@@ -3,34 +3,76 @@
 config BOARD_GOOGLE_ATLAS
 	bool "->  Atlas (Google Pixelbook Go)"
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_ATLAS
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_I2C_MAX98373
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_SPI_ACPI
+	select DRIVERS_USB_ACPI
+	select EXCLUDE_NATIVE_SD_INTERFACE
+	select MAINBOARD_HAS_LIBGFXINIT
+	select MAINBOARD_HAS_SPI_TPM_CR50
+	select VARIANT_HAS_CAMERA_ACPI
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 
 config BOARD_GOOGLE_POPPY
 	bool "->  Poppy"
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_POPPY
+	select DRIVERS_I2C_MAX98927
+	select NO_FADT_8042
+	select VARIANT_HAS_CAMERA_ACPI
+	select MAINBOARD_HAS_I2C_TPM_CR50
 
 config BOARD_GOOGLE_NAMI
 	bool "->  Nami"
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_NAMI
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_SPI_ACPI
+	select EXCLUDE_NATIVE_SD_INTERFACE
+	select MAINBOARD_HAS_SPI_TPM_CR50
 
 config BOARD_GOOGLE_NAUTILUS
 	bool "->  Nautilus (Samsung Chromebook Plus (V2 / LTE))"
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_NAUTILUS
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
+	select VARIANT_HAS_CAMERA_ACPI
+	select MAINBOARD_HAS_I2C_TPM_CR50
 
 config BOARD_GOOGLE_NOCTURNE
 	bool "->  Nocturne (Google Pixel Slate)"
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_NOCTURNE
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_I2C_SX9310 if CHROMEOS_WIFI_SAR
+	select DRIVERS_I2C_MAX98373
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_SPI_ACPI
+	select DRIVERS_USB_ACPI
+	select EXCLUDE_NATIVE_SD_INTERFACE
+	select MAINBOARD_HAS_SPI_TPM_CR50
+	select NO_FADT_8042
+	select SYSTEM_TYPE_DETACHABLE
+	select VARIANT_HAS_CAMERA_ACPI
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
 
 config BOARD_GOOGLE_RAMMUS
 	bool "->  Rammus (Asus Chromebook C425, Flip C433, Flip C434)"
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_RAMMUS
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_I2C_MAX98927
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_SPI_ACPI
+	select DRIVERS_USB_ACPI
+	select MAINBOARD_HAS_LIBGFXINIT
+	select MAINBOARD_HAS_SPI_TPM_CR50
 
 config BOARD_GOOGLE_SORAKA
 	bool "->  Soraka (HP Chromebook x2)"
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_SORAKA
+	select DRIVERS_I2C_MAX98927
+	select NO_FADT_8042
+	select SYSTEM_TYPE_DETACHABLE
+	select VARIANT_HAS_CAMERA_ACPI
+	select MAINBOARD_HAS_I2C_TPM_CR50

To view, visit change 42144. To unsubscribe, or for help writing mail filters, visit settings.