diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 72f7758b55..2381c797d9 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -10,6 +10,7 @@ config BOARD_GOOGLE_BASEBOARD_AURON
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select HAVE_OPTION_TABLE
+	select HAVE_SPD_IN_CBFS if !SYSTEM_TYPE_ALL_IN_ONE
 	select INTEL_GMA_HAVE_VBT
 	select INTEL_INT15
 	select MAINBOARD_HAS_CHROMEOS
@@ -17,34 +18,26 @@ config BOARD_GOOGLE_BASEBOARD_AURON
 	select MEMORY_MAPPED_TPM
 	select MAINBOARD_HAS_TPM1
 	select SOC_INTEL_BROADWELL
+	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_ALL_IN_ONE
 
 config BOARD_GOOGLE_AURON_PAINE
 	select BOARD_GOOGLE_BASEBOARD_AURON
-	select HAVE_SPD_IN_CBFS
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_AURON_YUNA
 	select BOARD_GOOGLE_BASEBOARD_AURON
-	select HAVE_SPD_IN_CBFS
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_BUDDY
 	select BOARD_GOOGLE_BASEBOARD_AURON
+	select SYSTEM_TYPE_ALL_IN_ONE
 
 config BOARD_GOOGLE_GANDOF
 	select BOARD_GOOGLE_BASEBOARD_AURON
-	select HAVE_SPD_IN_CBFS
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_LULU
 	select BOARD_GOOGLE_BASEBOARD_AURON
-	select HAVE_SPD_IN_CBFS
-	select SYSTEM_TYPE_LAPTOP
 
 config BOARD_GOOGLE_SAMUS
 	select BOARD_GOOGLE_BASEBOARD_AURON
-	select HAVE_SPD_IN_CBFS
-	select SYSTEM_TYPE_LAPTOP
 
 if BOARD_GOOGLE_BASEBOARD_AURON