2 files changed, 80 insertions, 54 deletions

diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index 1aac8b6115..08ddd80dbc 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -28,6 +28,86 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS
 	select SOC_ESPI
 	select SOC_INTEL_GEMINILAKE
 
+config BOARD_GOOGLE_AMPTON
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_BLOOG
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_BOBBA
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_CASTA
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_DOOD
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_FLEEX
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_FOOB
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_GARG
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_LICK
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_MEEP
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_OCTOPUS
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select BASEBOARD_OCTOPUS_LAPTOP
+
+config BOARD_GOOGLE_PHASER
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
+config BOARD_GOOGLE_YORP
+	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+	select BASEBOARD_OCTOPUS_LAPTOP
+	select INTEL_GMA_HAVE_VBT
+	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+
 if BOARD_GOOGLE_BASEBOARD_OCTOPUS
 
 config CHROMEOS_WIFI_SAR
diff --git a/src/mainboard/google/octopus/Kconfig.name b/src/mainboard/google/octopus/Kconfig.name
index 4168411b31..3657e9ca35 100644
--- a/src/mainboard/google/octopus/Kconfig.name
+++ b/src/mainboard/google/octopus/Kconfig.name
@@ -2,93 +2,39 @@ comment "Octopus"
 
 config BOARD_GOOGLE_AMPTON
 	bool "->  Ampton (ASUS Chromebook Flip C214)"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_BLOOG
 	bool "->  Bloog (HP Chromebook x360 12b, 14a, x360 14b)"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
-	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_BOBBA
 	bool "->  Bobba (Acer Chromebook 311 / Spin 511)"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
-	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_CASTA
 	bool "->  Bluebird/Casta (Samsung Chromebook 4, 4+)"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_DOOD
 	bool "->  Dood"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_FLEEX
 	bool "->  Fleex (Dell Chromebook 3100)"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
-	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_FOOB
 	bool "->  Foob"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_GARG
 	bool "->  Garg"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
-	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_LICK
 	bool "->  Lick (Ideapad 3 Chromebook)"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_MEEP
 	bool "->  Meep (HP Chromebook x360 11 G2 EE)"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
-	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_OCTOPUS
 	bool "->  Octopus"
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select BASEBOARD_OCTOPUS_LAPTOP
 
 config BOARD_GOOGLE_PHASER
 	bool "->  Phaser (Lenovo 100e/300e/500e Chromebook 2nd Gen (Intel))"
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
-	select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
 
 config BOARD_GOOGLE_YORP
 	bool "->  Yorp"
-	select BOARD_GOOGLE_BASEBOARD_OCTOPUS
-	select BASEBOARD_OCTOPUS_LAPTOP
-	select INTEL_GMA_HAVE_VBT
-	select NHLT_DA7219 if INCLUDE_NHLT_BLOBS