diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index b0dce1963e..a4bd882560 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -22,6 +22,30 @@ config BOARD_GOOGLE_BASEBOARD_REEF
 	select SOC_INTEL_APOLLOLAKE
 	select USE_SAR
 
+config BOARD_GOOGLE_REEF
+	select BASEBOARD_REEF_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_REEF
+
+config BOARD_GOOGLE_PYRO
+	select BASEBOARD_REEF_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_REEF
+
+config BOARD_GOOGLE_SAND
+	select BASEBOARD_REEF_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_REEF
+
+config BOARD_GOOGLE_SNAPPY
+	select BASEBOARD_REEF_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_REEF
+
+config BOARD_GOOGLE_NASHER
+	select BASEBOARD_REEF_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_REEF
+
+config BOARD_GOOGLE_CORAL
+	select BASEBOARD_REEF_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_REEF
+
 if BOARD_GOOGLE_BASEBOARD_REEF
 
 config BASEBOARD_REEF_LAPTOP
diff --git a/src/mainboard/google/reef/Kconfig.name b/src/mainboard/google/reef/Kconfig.name
index a3ca6f4e0f..2b33741db7 100644
--- a/src/mainboard/google/reef/Kconfig.name
+++ b/src/mainboard/google/reef/Kconfig.name
@@ -2,30 +2,18 @@ comment "Reef"
 
 config BOARD_GOOGLE_REEF
 	bool "->  Reef/Electro (Acer Chromebook Spin 11 R751T)"
-	select BASEBOARD_REEF_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_REEF
 
 config BOARD_GOOGLE_PYRO
 	bool "->  Pyro (Lenovo Thinkpad (Yoga) 11e Chromebook)"
-	select BASEBOARD_REEF_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_REEF
 
 config BOARD_GOOGLE_SAND
 	bool "->  Sand (Acer Chromebook 15 CB515-1HT/1H)"
-	select BASEBOARD_REEF_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_REEF
 
 config BOARD_GOOGLE_SNAPPY
 	bool "->  Snappy (HP Chromebook x360 11 G1 EE)"
-	select BASEBOARD_REEF_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_REEF
 
 config BOARD_GOOGLE_NASHER
 	bool "->  Nasher"
-	select BASEBOARD_REEF_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_REEF
 
 config BOARD_GOOGLE_CORAL
 	bool "->  Coral"
-	select BASEBOARD_REEF_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_REEF