diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index 04708999b3..f5ad431eb8 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -11,6 +11,66 @@ config BOARD_GOOGLE_JACUZZI_COMMON
 	# All Jacuzzi followers are using ANX7625 except the reference board.
 	select DRIVER_ANALOGIX_ANX7625 if !BOARD_GOOGLE_JACUZZI
 
+config BOARD_GOOGLE_KUKUI
+	select BOARD_GOOGLE_KUKUI_COMMON
+
+config BOARD_GOOGLE_KRANE
+	select BOARD_GOOGLE_KUKUI_COMMON
+
+config BOARD_GOOGLE_KODAMA
+	select BOARD_GOOGLE_KUKUI_COMMON
+
+config BOARD_GOOGLE_KAKADU
+	select BOARD_GOOGLE_KUKUI_COMMON
+
+config BOARD_GOOGLE_FLAPJACK
+	select BOARD_GOOGLE_KUKUI_COMMON
+
+config BOARD_GOOGLE_KATSU
+	select BOARD_GOOGLE_KUKUI_COMMON
+
+config BOARD_GOOGLE_JACUZZI
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_JUNIPER
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_KAPPA
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_DAMU
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_CERISE
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_STERN
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_WILLOW
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_ESCHE
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_BURNET
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_FENNEL
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_COZMO
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_MAKOMO
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_MUNNA
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
+config BOARD_GOOGLE_PICO
+	select BOARD_GOOGLE_JACUZZI_COMMON
+
 if BOARD_GOOGLE_KUKUI_COMMON
 
 config VBOOT
diff --git a/src/mainboard/google/kukui/Kconfig.name b/src/mainboard/google/kukui/Kconfig.name
index d4d3a65c83..a148c74807 100644
--- a/src/mainboard/google/kukui/Kconfig.name
+++ b/src/mainboard/google/kukui/Kconfig.name
@@ -2,82 +2,62 @@ comment "Kukui"
 
 config BOARD_GOOGLE_KUKUI
 	bool "->  Kukui"
-	select BOARD_GOOGLE_KUKUI_COMMON
 
 config BOARD_GOOGLE_KRANE
 	bool "->  Krane (Lenovo Chromebook Duet/Lenovo IdeaPad Duet Chromebook)"
-	select BOARD_GOOGLE_KUKUI_COMMON
 
 config BOARD_GOOGLE_KODAMA
 	bool "->  Kodama (Lenovo 10e Chromebook Tablet)"
-	select BOARD_GOOGLE_KUKUI_COMMON
 
 config BOARD_GOOGLE_KAKADU
 	bool "->  Kakadu"
-	select BOARD_GOOGLE_KUKUI_COMMON
 
 config BOARD_GOOGLE_FLAPJACK
 	bool "->  Flapjack"
-	select BOARD_GOOGLE_KUKUI_COMMON
 
 config BOARD_GOOGLE_KATSU
 	bool "->  Katsu"
-	select BOARD_GOOGLE_KUKUI_COMMON
 
 comment "Jacuzzi"
 
 config BOARD_GOOGLE_JACUZZI
 	bool "->  Jacuzzi"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_JUNIPER
 	bool "->  Juniper (Acer Chromebook Spin 311 (CP311-3H))"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_KAPPA
 	bool "->  Kappa"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_DAMU
 	bool "->  Damu (ASUS Chromebook Flip CM3 (CM3200))"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_CERISE
 	bool "->  Cerise"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_STERN
 	bool "->  Stern"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_WILLOW
 	bool "->  Willow"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_ESCHE
 	bool "->  Esche (HP Chromebook 11MK G9 EE)"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_BURNET
 	bool "->  Burnet (HP Chromebook x360 11MK G3 EE)"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_FENNEL
 	bool "->  Fennel"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_COZMO
 	bool "->  Cozmo"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_MAKOMO
 	bool "->  Makomo"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_MUNNA
 	bool "->  Munna"
-	select BOARD_GOOGLE_JACUZZI_COMMON
 
 config BOARD_GOOGLE_PICO
 	bool "->  Pico"
-	select BOARD_GOOGLE_JACUZZI_COMMON