diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 1abefb138c..de7888b011 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -6,6 +6,38 @@ config BOARD_GOOGLE_BASEBOARD_TREMBYLE
 config BOARD_GOOGLE_BASEBOARD_DALBOZ
 	def_bool n
 
+config BOARD_GOOGLE_DALBOZ
+	select BOARD_GOOGLE_BASEBOARD_DALBOZ
+
+config BOARD_GOOGLE_VILBOZ
+	select BOARD_GOOGLE_BASEBOARD_DALBOZ
+	select DRIVERS_I2C_SX9324
+	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+
+config BOARD_GOOGLE_EZKINIL
+	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+
+config BOARD_GOOGLE_MORPHIUS
+	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+
+config BOARD_GOOGLE_TREMBYLE
+	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+
+config BOARD_GOOGLE_BERKNIP
+	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+
+config BOARD_GOOGLE_WOOMAX
+	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
+
+config BOARD_GOOGLE_DIRINBOZ
+	select BOARD_GOOGLE_BASEBOARD_DALBOZ
+
+config BOARD_GOOGLE_SHUBOZ
+	select BOARD_GOOGLE_BASEBOARD_DALBOZ
+
+config BOARD_GOOGLE_GUMBOZ
+	select BOARD_GOOGLE_BASEBOARD_DALBOZ
+
 if BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ
 
 config BOARD_SPECIFIC_OPTIONS
diff --git a/src/mainboard/google/zork/Kconfig.name b/src/mainboard/google/zork/Kconfig.name
index 4e6cfc52c2..36ebff6d75 100644
--- a/src/mainboard/google/zork/Kconfig.name
+++ b/src/mainboard/google/zork/Kconfig.name
@@ -2,42 +2,30 @@ comment "Zork"
 
 config BOARD_GOOGLE_DALBOZ
 	bool "->  Dalboz"
-	select BOARD_GOOGLE_BASEBOARD_DALBOZ
 
 config BOARD_GOOGLE_VILBOZ
 	bool "->  Vilboz (Lenovo 100e/300e Gen3 AMD)"
-	select BOARD_GOOGLE_BASEBOARD_DALBOZ
-	select DRIVERS_I2C_SX9324
-	select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
 
 config BOARD_GOOGLE_EZKINIL
 	bool "->  Ezkinil (Acer Chromebook Spin 514)"
-	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
 
 config BOARD_GOOGLE_MORPHIUS
 	bool "->  Morphius (Lenovo ThinkPad C13 Yoga Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
 
 config BOARD_GOOGLE_TREMBYLE
 	bool "->  Trembyle"
-	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
 
 config BOARD_GOOGLE_BERKNIP
 	bool "->  Berknip (HP Pro c645 Chromebook Enterprise)"
-	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
 
 config BOARD_GOOGLE_WOOMAX
 	bool "->  Woomax (ASUS Chromebook Flip CM5)"
-	select BOARD_GOOGLE_BASEBOARD_TREMBYLE
 
 config BOARD_GOOGLE_DIRINBOZ
 	bool "->  Dirinboz (HP Chromebook 14a-nd0097nr)"
-	select BOARD_GOOGLE_BASEBOARD_DALBOZ
 
 config BOARD_GOOGLE_SHUBOZ
 	bool "->  Shuboz"
-	select BOARD_GOOGLE_BASEBOARD_DALBOZ
 
 config BOARD_GOOGLE_GUMBOZ
 	bool "->  Gumboz (HP Chromebook x360 14a)"
-	select BOARD_GOOGLE_BASEBOARD_DALBOZ