2 files changed, 40 insertions, 26 deletions
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index 3c5216317b..6fbbe42973 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -23,6 +23,46 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS
 	select SOC_INTEL_SKYLAKE
 	select SYSTEM_TYPE_LAPTOP
 
+config BOARD_GOOGLE_ASUKA
+	select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select DRIVERS_GENERIC_MAX98357A
+	select EXCLUDE_NATIVE_SD_INTERFACE
+	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_CAROLINE
+	select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select DSAR_ENABLE
+	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
+	select SAR_ENABLE
+	select USE_SAR
+
+config BOARD_GOOGLE_CAVE
+	select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select DRIVERS_GENERIC_MAX98357A
+	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_CHELL
+	select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_GLADOS
+	select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select NHLT_DMIC_4CH if INCLUDE_NHLT_BLOBS
+	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_LARS
+	select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select DRIVERS_GENERIC_MAX98357A
+	select EXCLUDE_NATIVE_SD_INTERFACE
+	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_SENTRY
+	select BOARD_GOOGLE_BASEBOARD_GLADOS
+	select DRIVERS_GENERIC_MAX98357A
+	select NHLT_DMIC_4CH if INCLUDE_NHLT_BLOBS
+	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
+	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
+
 if BOARD_GOOGLE_BASEBOARD_GLADOS
 
 config VBOOT
diff --git a/src/mainboard/google/glados/Kconfig.name b/src/mainboard/google/glados/Kconfig.name
index 5b1c383ce7..11a53c5cdd 100644
--- a/src/mainboard/google/glados/Kconfig.name
+++ b/src/mainboard/google/glados/Kconfig.name
@@ -2,47 +2,21 @@ comment "Glados"
 
 config BOARD_GOOGLE_ASUKA
 	bool "->  Asuka (Dell Chromebook 13 3380)"
-	select BOARD_GOOGLE_BASEBOARD_GLADOS
-	select DRIVERS_GENERIC_MAX98357A
-	select EXCLUDE_NATIVE_SD_INTERFACE
-	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_CAROLINE
 	bool "->  Caroline (Samsung Chromebook Pro)"
-	select BOARD_GOOGLE_BASEBOARD_GLADOS
-	select DSAR_ENABLE
-	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
-	select SAR_ENABLE
-	select USE_SAR
 
 config BOARD_GOOGLE_CAVE
 	bool "->  Cave (Asus Chromebook Flip C302SA)"
-	select BOARD_GOOGLE_BASEBOARD_GLADOS
-	select DRIVERS_GENERIC_MAX98357A
-	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_CHELL
 	bool "->  Chell (HP Chromebook 13 G1)"
-	select BOARD_GOOGLE_BASEBOARD_GLADOS
-	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_GLADOS
 	bool "->  Glados Skylake Reference Board"
-	select BOARD_GOOGLE_BASEBOARD_GLADOS
-	select NHLT_DMIC_4CH if INCLUDE_NHLT_BLOBS
-	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_LARS
 	bool "->  Lars (Acer Chromebook 14 for Work (CP5-471))"
-	select BOARD_GOOGLE_BASEBOARD_GLADOS
-	select DRIVERS_GENERIC_MAX98357A
-	select EXCLUDE_NATIVE_SD_INTERFACE
-	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_SENTRY
 	bool "->  Sentry (Lenovo Thinkpad 13 Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_GLADOS
-	select DRIVERS_GENERIC_MAX98357A
-	select NHLT_DMIC_4CH if INCLUDE_NHLT_BLOBS
-	select NHLT_MAX98357 if INCLUDE_NHLT_BLOBS
-	select NHLT_SSM4567 if INCLUDE_NHLT_BLOBS