mb/google/volteer: Move selects from Kconfig.name to Kconfig

Move selects from Kconfig.name to Kconfig so that the configuration is
at one place and not distributed over two files.

Change-Id: I72c0e0c3968cb2e92b35381691762148f4c270e4
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60369
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>

2 files changed, 83 insertions, 45 deletions

diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 8a605ca999..ced8d9dbe5 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -35,6 +35,89 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select SOC_INTEL_CSE_LITE_SKU
 	select SOC_INTEL_TIGERLAKE
 
+config BOARD_GOOGLE_DELBIN
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select DRIVERS_GENESYSLOGIC_GL9755
+
+config BOARD_GOOGLE_ELDRID
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_HALVOR
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_CAR_NEM
+
+config BOARD_GOOGLE_LINDAR
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select CHROMEOS_DSM_CALIB if CHROMEOS
+	select DRIVERS_GENERIC_BAYHUB_LV2
+	select DRIVERS_I2C_RT1011
+	select INTEL_CAR_NEM
+
+config BOARD_GOOGLE_MALEFOR
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_CAR_NEM
+
+config BOARD_GOOGLE_TERRADOR
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_TODOR
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_CAR_NEM
+
+config BOARD_GOOGLE_TRONDO
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_CAR_NEM
+
+config BOARD_GOOGLE_VOLTEER
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_CAR_NEM
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select VARIANT_HAS_MIPI_CAMERA
+
+config BOARD_GOOGLE_VOLTEER2
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select DRIVER_I2C_TPM_ACPI
+	select DRIVERS_GENESYSLOGIC_GL9755
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select VARIANT_HAS_MIPI_CAMERA
+
+config BOARD_GOOGLE_VOLTEER2_TI50
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select DRIVER_I2C_TPM_ACPI
+	select DRIVERS_GENESYSLOGIC_GL9755
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select VARIANT_HAS_MIPI_CAMERA
+
+config BOARD_GOOGLE_VOXEL
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+
+config BOARD_GOOGLE_ELEMI
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_VOEMA
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select VARIANT_HAS_MIPI_CAMERA
+
+config BOARD_GOOGLE_DROBIT
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select DRIVERS_GENESYSLOGIC_GL9755
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+
+config BOARD_GOOGLE_COPANO
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+
+config BOARD_GOOGLE_COLLIS
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_VOLET
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
+config BOARD_GOOGLE_CHRONICLER
+	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+
 if BOARD_GOOGLE_BASEBOARD_VOLTEER
 
 config CHROMEOS
diff --git a/src/mainboard/google/volteer/Kconfig.name b/src/mainboard/google/volteer/Kconfig.name
index be82d3288b..d868e52578 100644
--- a/src/mainboard/google/volteer/Kconfig.name
+++ b/src/mainboard/google/volteer/Kconfig.name
@@ -2,103 +2,58 @@ comment "Volteer"
 
 config BOARD_GOOGLE_DELBIN
 	bool "->  Delbin (ASUS Chromebook Flip CX5)"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select DRIVERS_GENESYSLOGIC_GL9755
 
 config BOARD_GOOGLE_ELDRID
 	bool "->  Eldrid"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 
 config BOARD_GOOGLE_HALVOR
 	bool "->  Halvor"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_LINDAR
 	bool "->  Lindar"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select CHROMEOS_DSM_CALIB if CHROMEOS
-	select DRIVERS_GENERIC_BAYHUB_LV2
-	select DRIVERS_I2C_RT1011
-	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_MALEFOR
 	bool "->  Malefor"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_TERRADOR
 	bool "->  Terrador"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 
 config BOARD_GOOGLE_TODOR
 	bool "->  Todor"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_TRONDO
 	bool "->  Trondo"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select INTEL_CAR_NEM
 
 config BOARD_GOOGLE_VOLTEER
 	bool "->  Volteer"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select INTEL_CAR_NEM
-	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
-	select VARIANT_HAS_MIPI_CAMERA
 
 config BOARD_GOOGLE_VOLTEER2
 	bool "->  Volteer2"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select DRIVER_I2C_TPM_ACPI
-	select DRIVERS_GENESYSLOGIC_GL9755
-	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
-	select VARIANT_HAS_MIPI_CAMERA
 
 # Reworked Volteer2 prototype, Haven chip replaced with Dauntless demo board
 config BOARD_GOOGLE_VOLTEER2_TI50
 	bool "->  Volteer2_Ti50"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select DRIVER_I2C_TPM_ACPI
-	select DRIVERS_GENESYSLOGIC_GL9755
-	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
-	select VARIANT_HAS_MIPI_CAMERA
 
 config BOARD_GOOGLE_VOXEL
 	bool "->  Voxel (Acer Chromebook Spin 713 (CP713-3W))"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
-	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 
 config BOARD_GOOGLE_ELEMI
 	bool "->  Elemi (HP Pro c640 G2 Chromebook)"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 
 config BOARD_GOOGLE_VOEMA
 	bool "->  Voema"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select VARIANT_HAS_MIPI_CAMERA
 
 config BOARD_GOOGLE_DROBIT
 	bool "->  Drobit (ASUS Chromebook CX9400)"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select DRIVERS_GENESYSLOGIC_GL9755
-	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 
 config BOARD_GOOGLE_COPANO
 	bool "->  Copano (ASUS Chromebook Flip CX5400)"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
-	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 
 config BOARD_GOOGLE_COLLIS
 	bool "->  Collis"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 
 config BOARD_GOOGLE_VOLET
 	bool "->  Volet"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 
 config BOARD_GOOGLE_CHRONICLER
 	bool "->  Chronicler"
-	select BOARD_GOOGLE_BASEBOARD_VOLTEER