diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 586180b30e..462b6943bf 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -10,12 +10,12 @@ config BOARD_GOOGLE_BASEBOARD_POPPY
 	select EC_GOOGLE_CHROMEEC_ESPI
 	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 SOC_INTEL_KABYLAKE
 	select MAINBOARD_HAS_TPM2
-	select HAVE_SPD_IN_CBFS
+	select SOC_INTEL_KABYLAKE
 
 if BOARD_GOOGLE_BASEBOARD_POPPY
 
@@ -130,8 +130,8 @@ config VARIANT_HAS_CAMERA_ACPI
 config VARIANT_SPECIFIC_OPTIONS_ATLAS
 	def_bool n
 	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_MAX98373
 	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_MAX98373
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
 	select EXCLUDE_NATIVE_SD_INTERFACE
@@ -171,9 +171,9 @@ config VARIANT_SPECIFIC_OPTIONS_NAUTILUS
 config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
 	def_bool n
 	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_SX9310
-	select DRIVERS_I2C_MAX98373
 	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
@@ -186,8 +186,8 @@ config VARIANT_SPECIFIC_OPTIONS_NOCTURNE
 config VARIANT_SPECIFIC_OPTIONS_RAMMUS
 	def_bool n
 	select CHROMEOS_WIFI_SAR if CHROMEOS
-	select DRIVERS_I2C_MAX98927
 	select DRIVERS_I2C_DA7219
+	select DRIVERS_I2C_MAX98927
 	select DRIVERS_SPI_ACPI
 	select DRIVERS_USB_ACPI
 	select MAINBOARD_HAS_LIBGFXINIT