mb/google/brya: Move selects from Kconfig.name to Kconfig
Selects should be done in the Kconfig file instead of Kconfig.name and
not mixed over both files.
Change-Id: I1439f785cb9ceeefab9d24caa88e35bd43f68315
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78126
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index c400af6..2863fdb 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -97,6 +97,404 @@
select TPM_GOOGLE_TI50
select SOC_INTEL_COMMON_MMC_OVERRIDE
+config BOARD_GOOGLE_AGAH
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select INCLUDE_NVIDIA_GPU_ASL
+ select PCIEXP_SUPPORT_RESIZABLE_BARS
+ select RT8168_GEN_ACPI_POWER_RESOURCE
+ select RT8168_GET_MAC_FROM_VPD
+ select RT8168_SET_LED_MODE
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_ANAHERA
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DRIVERS_GENESYSLOGIC_GL9763E
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select HAVE_PCIE_WWAN
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_ANAHERA4ES
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DEFAULT_ADL_NEM
+ select DRIVERS_GENESYSLOGIC_GL9763E
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select HAVE_PCIE_WWAN
+ select HAVE_WWAN_POWER_SEQUENCE
+
+config BOARD_GOOGLE_AURASH
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_BANSHEE
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select INTEL_GMA_HAVE_VBT
+ select MEMORY_SODIMM
+
+config BOARD_GOOGLE_BRASK
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_CRASHLOG
+
+config BOARD_GOOGLE_BRYA0
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select SOC_INTEL_COMMON_BLOCK_IPU
+ select SOC_INTEL_CRASHLOG
+ select SOC_INTEL_RAPTORLAKE
+ select DRIVERS_GENERIC_NAU8315
+
+config BOARD_GOOGLE_CRAASK
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_CRAASKOV
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+
+config BOARD_GOOGLE_CONSTITUTION
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select MEMORY_SOLDERDOWN
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_CROTA
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_I2C_CS42L42
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_FELWINTER
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_GAELIN
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_GIMBLE
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_I2C_MAX98390
+ select GOOGLE_DSM_CALIB if VPD
+ select GOOGLE_DSM_PARAM_FILE_NAME if VPD
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_GIMBLE4ES
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DEFAULT_ADL_NEM
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_I2C_MAX98390
+ select GOOGLE_DSM_CALIB if VPD
+ select GOOGLE_DSM_PARAM_FILE_NAME if VPD
+
+config BOARD_GOOGLE_GLADIOS
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENESYSLOGIC_GL9763E
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_GOTHRAX
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select HAVE_WWAN_POWER_SEQUENCE
+
+config BOARD_GOOGLE_HADES
+ select BOARD_GOOGLE_BASEBOARD_HADES
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select RT8168_GEN_ACPI_POWER_RESOURCE
+ select RT8168_GET_MAC_FROM_VPD
+ select RT8168_SET_LED_MODE
+
+config BOARD_GOOGLE_KANO
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_I2C_MAX98373
+ select DRIVERS_I2C_NAU8825
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_COMMON_BLOCK_IPU
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_KINOX
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_KULDAX
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_JOXER
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_LISBON
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_GENESYSLOGIC_GL9763E
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_MARASOV
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DRIVERS_INTEL_ISH
+ select SOC_INTEL_RAPTORLAKE
+ select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
+
+config BOARD_GOOGLE_MITHRAX
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_MOLI
+ select BOARD_GOOGLE_BASEBOARD_BRASK
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_NIVVIKS
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select BOARD_ROMSIZE_KB_32768
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_NEREID
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select BOARD_ROMSIZE_KB_32768
+ select DRIVERS_GENERIC_BAYHUB_LV2
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_OMNIGUL
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_INTEL_ISH
+ select SOC_INTEL_RAPTORLAKE
+ select USE_UNIFIED_AP_FIRMWARE_FOR_UFS_AND_NON_UFS
+
+config BOARD_GOOGLE_OSIRIS
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select INTEL_GMA_HAVE_VBT
+ select RT8168_GEN_ACPI_POWER_RESOURCE
+ select RT8168_GET_MAC_FROM_VPD
+ select RT8168_SET_LED_MODE
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_PIRRHA
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select DRIVERS_I2C_DA7219
+
+config BOARD_GOOGLE_PRIMUS
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select HAVE_PCIE_WWAN
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_PRIMUS4ES
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DEFAULT_ADL_NEM
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select HAVE_PCIE_WWAN
+ select HAVE_WWAN_POWER_SEQUENCE
+
+config BOARD_GOOGLE_PUJJO
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_BAYHUB_LV2
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select DRIVERS_WWAN_FM350GL
+ select HAVE_PCIE_WWAN
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_QUANDISO
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select HAVE_WWAN_POWER_SEQUENCE
+
+config BOARD_GOOGLE_REDRIX
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select GOOGLE_DSM_CALIB if VPD
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select DRIVERS_I2C_MAX98390
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select GOOGLE_DSM_PARAM_FILE_NAME if VPD
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_REDRIX4ES
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DEFAULT_ADL_NEM
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select DRIVERS_I2C_MAX98390
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select GOOGLE_DSM_CALIB if VPD
+ select GOOGLE_DSM_PARAM_FILE_NAME if VPD
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_SKOLAS
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_COMMON_BLOCK_IPU
+ select SOC_INTEL_RAPTORLAKE
+ select DRIVERS_GENERIC_NAU8315
+
+config BOARD_GOOGLE_SKOLAS4ES
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select DEFAULT_ADL_NEM
+ select DRIVERS_GENESYSLOGIC_GL9755
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_COMMON_BLOCK_IPU
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_TAEKO
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_BAYHUB_LV2
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_GENESYSLOGIC_GL9763E
+ select DRIVERS_GENESYSLOGIC_GL9763E_L1_MAX if DRIVERS_GENESYSLOGIC_GL9763E
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_TAEKO4ES
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DEFAULT_ADL_NEM
+ select DRIVERS_GENERIC_BAYHUB_LV2
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_GENESYSLOGIC_GL9763E
+
+config BOARD_GOOGLE_TANIKS
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_BAYHUB_LV2
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_GENESYSLOGIC_GL9763E
+ select DRIVERS_GENESYSLOGIC_GL9763E_L1_MAX
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_ULDREN
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_I2C_CS42L42
+ select HAVE_WWAN_POWER_SEQUENCE
+
+config BOARD_GOOGLE_VELL
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select DRIVERS_I2C_CS35L53
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_VOLMAR
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select DRIVERS_I2C_MAX98373
+ select DRIVERS_I2C_NAU8825
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_XIVU
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_YAVIKS
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENESYSLOGIC_GL9750
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+
+config BOARD_GOOGLE_YAVILLA
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DRIVERS_GENERIC_GPIO_KEYS
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select HAVE_WWAN_POWER_SEQUENCE
+ select INTEL_GMA_HAVE_VBT
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+
+config BOARD_GOOGLE_ZYDRON
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+ select CHROMEOS_WIFI_SAR if CHROMEOS
+ select DEFAULT_ADL_NEM
+ select DRIVERS_I2C_MAX98373
+ select DRIVERS_I2C_NAU8825
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
+ select SOC_INTEL_COMMON_BLOCK_IPU
+ select SOC_INTEL_RAPTORLAKE
+
+config BOARD_GOOGLE_NOKRIS
+ select BOARD_GOOGLE_BASEBOARD_NISSA
+
+config BOARD_GOOGLE_DOCHI
+ select BOARD_GOOGLE_BASEBOARD_BRYA
+
if BOARD_GOOGLE_BRYA_COMMON
config BASEBOARD_DIR