diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index dce2ecc4cf..b938ed75c2 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -19,31 +19,78 @@ config BOARD_GOOGLE_BASEBOARD_POPPY
 
 config BOARD_GOOGLE_ATLAS
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_ATLAS
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_MAX98373
+	select DRIVERS_SPI_ACPI
+	select DRIVERS_USB_ACPI
+	select EXCLUDE_NATIVE_SD_INTERFACE
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select MAINBOARD_HAS_LIBGFXINIT
+	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SYSTEM_TYPE_LAPTOP
+	select VARIANT_HAS_CAMERA_ACPI
 
 config BOARD_GOOGLE_POPPY
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_POPPY
+	select DRIVERS_I2C_MAX98927
+	select MAINBOARD_HAS_I2C_TPM_CR50
+	select NO_FADT_8042
+	select SYSTEM_TYPE_LAPTOP
+	select VARIANT_HAS_CAMERA_ACPI
 
 config BOARD_GOOGLE_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
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_NAUTILUS
 	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 MAINBOARD_HAS_I2C_TPM_CR50
+	select SYSTEM_TYPE_CONVERTIBLE
+	select VARIANT_HAS_CAMERA_ACPI
 
 config BOARD_GOOGLE_NOCTURNE
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_NOCTURNE
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_MAX98373
+	select DRIVERS_I2C_SX9310
+	select DRIVERS_SPI_ACPI
+	select DRIVERS_USB_ACPI
+	select EXCLUDE_NATIVE_SD_INTERFACE
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select MAINBOARD_HAS_SPI_TPM_CR50
+	select NO_FADT_8042
+	select SYSTEM_TYPE_DETACHABLE
+	select VARIANT_HAS_CAMERA_ACPI
 
 config BOARD_GOOGLE_RAMMUS
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_RAMMUS
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_MAX98927
+	select DRIVERS_SPI_ACPI
+	select DRIVERS_USB_ACPI
+	select MAINBOARD_HAS_LIBGFXINIT
+	select MAINBOARD_HAS_SPI_TPM_CR50
+	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_SORAKA
 	select BOARD_GOOGLE_BASEBOARD_POPPY
-	select VARIANT_SPECIFIC_OPTIONS_SORAKA
+	select DRIVERS_I2C_MAX98927
+	select MAINBOARD_HAS_I2C_TPM_CR50
+	select NO_FADT_8042
+	select SYSTEM_TYPE_DETACHABLE
+	select VARIANT_HAS_CAMERA_ACPI
 
 if BOARD_GOOGLE_BASEBOARD_POPPY
 
@@ -155,81 +202,6 @@ config VARIANT_HAS_CAMERA_ACPI
 	bool
 	default n
 
-config VARIANT_SPECIFIC_OPTIONS_ATLAS
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_I2C_MAX98373
-	select DRIVERS_SPI_ACPI
-	select DRIVERS_USB_ACPI
-	select EXCLUDE_NATIVE_SD_INTERFACE
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_SPI_TPM_CR50
-	select SYSTEM_TYPE_LAPTOP
-	select VARIANT_HAS_CAMERA_ACPI
-
-config VARIANT_SPECIFIC_OPTIONS_POPPY
-	def_bool n
-	select DRIVERS_I2C_MAX98927
-	select MAINBOARD_HAS_I2C_TPM_CR50
-	select NO_FADT_8042
-	select SYSTEM_TYPE_LAPTOP
-	select VARIANT_HAS_CAMERA_ACPI
-
-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
-	select SYSTEM_TYPE_LAPTOP
-
-config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
-	select MAINBOARD_HAS_I2C_TPM_CR50
-	select SYSTEM_TYPE_CONVERTIBLE
-	select VARIANT_HAS_CAMERA_ACPI
-
-config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_I2C_MAX98373
-	select DRIVERS_I2C_SX9310
-	select DRIVERS_SPI_ACPI
-	select DRIVERS_USB_ACPI
-	select EXCLUDE_NATIVE_SD_INTERFACE
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select MAINBOARD_HAS_SPI_TPM_CR50
-	select NO_FADT_8042
-	select SYSTEM_TYPE_DETACHABLE
-	select VARIANT_HAS_CAMERA_ACPI
-
-config VARIANT_SPECIFIC_OPTIONS_RAMMUS
-	def_bool n
-	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_I2C_MAX98927
-	select DRIVERS_SPI_ACPI
-	select DRIVERS_USB_ACPI
-	select MAINBOARD_HAS_LIBGFXINIT
-	select MAINBOARD_HAS_SPI_TPM_CR50
-	select SYSTEM_TYPE_LAPTOP
-
-config VARIANT_SPECIFIC_OPTIONS_SORAKA
-	def_bool n
-	select DRIVERS_I2C_MAX98927
-	select MAINBOARD_HAS_I2C_TPM_CR50
-	select NO_FADT_8042
-	select SYSTEM_TYPE_DETACHABLE
-	select VARIANT_HAS_CAMERA_ACPI
-
 config VBOOT
 	select EC_GOOGLE_CHROMEEC_SWITCHES
 	select HAS_RECOVERY_MRC_CACHE