1 files changed, 21 insertions, 64 deletions
diff --git a/src/mainboard/google/kukui/Kconfig b/src/mainboard/google/kukui/Kconfig
index f5ad431eb8..9649e25278 100644
--- a/src/mainboard/google/kukui/Kconfig
+++ b/src/mainboard/google/kukui/Kconfig
@@ -1,76 +1,33 @@
 ## SPDX-License-Identifier: GPL-2.0-only
 
-# Umbrella option to be selected by variant boards.
 config BOARD_GOOGLE_KUKUI_COMMON
-	def_bool n
+	def_bool BOARD_GOOGLE_FLAPJACK || \
+		 BOARD_GOOGLE_JACUZZI_COMMON || \
+		 BOARD_GOOGLE_KAKADU || \
+		 BOARD_GOOGLE_KATSU || \
+		 BOARD_GOOGLE_KODAMA || \
+		 BOARD_GOOGLE_KRANE || \
+		 BOARD_GOOGLE_KUKUI
 
 config BOARD_GOOGLE_JACUZZI_COMMON
-	def_bool n
-	select BOARD_GOOGLE_KUKUI_COMMON
+	def_bool BOARD_GOOGLE_BURNET || \
+		 BOARD_GOOGLE_COZMO || \
+		 BOARD_GOOGLE_DAMU || \
+		 BOARD_GOOGLE_CERISE || \
+		 BOARD_GOOGLE_ESCHE || \
+		 BOARD_GOOGLE_FENNEL || \
+		 BOARD_GOOGLE_JACUZZI || \
+		 BOARD_GOOGLE_JUNIPER || \
+		 BOARD_GOOGLE_KAPPA || \
+		 BOARD_GOOGLE_MAKOMO || \
+		 BOARD_GOOGLE_MUNNA || \
+		 BOARD_GOOGLE_PICO || \
+		 BOARD_GOOGLE_STERN || \
+		 BOARD_GOOGLE_WILLOW
 	select DRIVER_PARADE_PS8640 if BOARD_GOOGLE_JACUZZI
 	# 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