mb/google/dedede: 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: I5527d5968be35f52b912d9d6e1d9f46f24569bbc
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78127
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig
index 02087ac..be8c04a 100644
--- a/src/mainboard/google/dedede/Kconfig
+++ b/src/mainboard/google/dedede/Kconfig
@@ -45,6 +45,189 @@
select MEMORY_MAPPED_TPM
select BOARD_GOOGLE_BASEBOARD_DEDEDE
+config BOARD_GOOGLE_BOTEN
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_DIBBI
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select RT8168_GEN_ACPI_POWER_RESOURCE
+ select RT8168_GET_MAC_FROM_VPD
+ select RT8168_SET_LED_MODE
+
+config BOARD_GOOGLE_DEDEDE
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select BOARD_ROMSIZE_KB_32768
+
+config BOARD_GOOGLE_DRAWCIA
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_HABOKI
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_MADOO
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_WADDLEDOO
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select BOARD_ROMSIZE_KB_32768
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_DA7219
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_WADDLEDEE
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select BOARD_ROMSIZE_KB_32768
+
+config BOARD_GOOGLE_LALALA
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_MAGOLOR
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_I2C_DA7219
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+ select INTEL_GMA_HAVE_VBT
+ select SOC_INTEL_COMMON_BLOCK_IPU
+
+config BOARD_GOOGLE_METAKNIGHT
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+
+config BOARD_GOOGLE_LANTIS
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+
+config BOARD_GOOGLE_GALTIC
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_SASUKE
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_DA7219
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_STORO
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select DRIVERS_INTEL_MIPI_CAMERA
+ select SOC_INTEL_COMMON_BLOCK_IPU
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_SASUKETTE
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_KRACKO
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_BLIPPER
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_CRET
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_DA7219
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_PIRIKA
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_CAPPY2
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+ select BASEBOARD_DEDEDE_LAPTOP
+
+config BOARD_GOOGLE_BUGZZY
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_DA7219
+ select DRIVERS_I2C_SX9360
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_CORORI
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+
+config BOARD_GOOGLE_DRIBLEE
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+
+config BOARD_GOOGLE_GOOEY
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_BEADRIX
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select BASEBOARD_DEDEDE_LAPTOP
+ select DRIVERS_GENERIC_MAX98357A
+ select DRIVERS_I2C_SX9324
+ select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
+
+config BOARD_GOOGLE_SHOTZO
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+
+config BOARD_GOOGLE_TARANZA
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select RT8168_GEN_ACPI_POWER_RESOURCE
+ select RT8168_GET_MAC_FROM_VPD
+ select RT8168_SET_LED_MODE
+ select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+
+config BOARD_GOOGLE_BOXY
+ select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
+ select RT8168_GEN_ACPI_POWER_RESOURCE
+ select RT8168_GET_MAC_FROM_VPD
+ select RT8168_SET_LED_MODE
+
if BOARD_GOOGLE_BASEBOARD_DEDEDE
config BASEBOARD_DEDEDE_LAPTOP
diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name
index f668fb1..f11770e 100644
--- a/src/mainboard/google/dedede/Kconfig.name
+++ b/src/mainboard/google/dedede/Kconfig.name
@@ -2,34 +2,15 @@
config BOARD_GOOGLE_BOTEN
bool "-> Boten (Lenovo 500e Chromebook Gen 3)"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_I2C_SX9324
- select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_DIBBI
bool "-> Dibbi"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select RT8168_GEN_ACPI_POWER_RESOURCE
- select RT8168_GET_MAC_FROM_VPD
- select RT8168_SET_LED_MODE
config BOARD_GOOGLE_DEDEDE
bool "-> Dedede"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select BOARD_ROMSIZE_KB_32768
config BOARD_GOOGLE_DRAWCIA
bool "-> Drawcia"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
- select DRIVERS_INTEL_MIPI_CAMERA
- select INTEL_GMA_HAVE_VBT
- select SOC_INTEL_COMMON_BLOCK_IPU
help
The Drawcia board supports the following devices:
- HP Chromebook x360 11 G4 EE (Drawcia)
@@ -38,181 +19,75 @@
config BOARD_GOOGLE_HABOKI
bool "-> HABOKI"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
- select DRIVERS_INTEL_MIPI_CAMERA
- select SOC_INTEL_COMMON_BLOCK_IPU
config BOARD_GOOGLE_MADOO
bool "-> Madoo"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_WADDLEDOO
bool "-> Waddledoo"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select BOARD_ROMSIZE_KB_32768
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_DA7219
- select DRIVERS_INTEL_MIPI_CAMERA
- select SOC_INTEL_COMMON_BLOCK_IPU
config BOARD_GOOGLE_WADDLEDEE
bool "-> Waddledee"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select BOARD_ROMSIZE_KB_32768
config BOARD_GOOGLE_LALALA
bool "-> Lalala"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_INTEL_MIPI_CAMERA
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
- select SOC_INTEL_COMMON_BLOCK_IPU
config BOARD_GOOGLE_MAGOLOR
bool "-> Magolor"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_I2C_DA7219
- select DRIVERS_INTEL_MIPI_CAMERA
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
- select INTEL_GMA_HAVE_VBT
- select SOC_INTEL_COMMON_BLOCK_IPU
config BOARD_GOOGLE_METAKNIGHT
bool "-> Metaknight"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
config BOARD_GOOGLE_LANTIS
bool "-> Lantis"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
config BOARD_GOOGLE_GALTIC
bool "-> Galtic"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_SASUKE
bool "-> Sasuke (Samsung Galaxy Chromebook Go)"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_DA7219
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_STORO
bool "-> Storo (Asus Chromebook CR1100)"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_I2C_SX9324
- select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
- select DRIVERS_INTEL_MIPI_CAMERA
- select SOC_INTEL_COMMON_BLOCK_IPU
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_SASUKETTE
bool "-> Sasukette"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_KRACKO
bool "-> Kracko"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_SX9324
- select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_BLIPPER
bool "-> Blipper"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_CRET
bool "-> Cret"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_DA7219
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_PIRIKA
bool "-> Pirika"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_CAPPY2
bool "-> Cappy2"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
- select BASEBOARD_DEDEDE_LAPTOP
config BOARD_GOOGLE_BUGZZY
bool "-> Bugzzy"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_DA7219
- select DRIVERS_I2C_SX9360
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_CORORI
bool "-> Corori"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
config BOARD_GOOGLE_DRIBLEE
bool "-> Driblee"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
config BOARD_GOOGLE_GOOEY
bool "-> Gooey"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_TPM2
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_I2C_SX9324
- select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_BEADRIX
bool "-> Beadrix"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select BASEBOARD_DEDEDE_LAPTOP
- select DRIVERS_GENERIC_MAX98357A
- select DRIVERS_I2C_SX9324
- select DRIVERS_I2C_SX9324_SUPPORT_LEGACY_LINUX_DRIVER
config BOARD_GOOGLE_SHOTZO
bool "-> Shotzo"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
config BOARD_GOOGLE_TARANZA
bool "-> Taranza"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select RT8168_GEN_ACPI_POWER_RESOURCE
- select RT8168_GET_MAC_FROM_VPD
- select RT8168_SET_LED_MODE
- select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
config BOARD_GOOGLE_BOXY
bool "-> Boxy"
- select BOARD_GOOGLE_BASEBOARD_DEDEDE_CR50
- select RT8168_GEN_ACPI_POWER_RESOURCE
- select RT8168_GET_MAC_FROM_VPD
- select RT8168_SET_LED_MODE