mb/google/volteer/Kconfig: Alphabetize variants, Kconfig selections

Change-Id: I634af65cd41e0d70e673d550ed8063abc6eea6d4
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74853
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
This commit is contained in:
Matt DeVillier 2023-04-28 10:31:18 -05:00 committed by Matt DeVillier
parent 7e6f323d98
commit 03220d6023
2 changed files with 69 additions and 69 deletions

View File

@ -27,26 +27,49 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
select HAVE_ACPI_RESUME select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES
select HAVE_SPD_IN_CBFS select HAVE_SPD_IN_CBFS
select I2C_TPM if BOARD_GOOGLE_VOLTEER2_TI50
select INTEL_LPSS_UART_FOR_CONSOLE select INTEL_LPSS_UART_FOR_CONSOLE
select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_CHROMEOS
select I2C_TPM if BOARD_GOOGLE_VOLTEER2_TI50
select SPI_TPM if !BOARD_GOOGLE_VOLTEER2_TI50
select MAINBOARD_HAS_TPM2 select MAINBOARD_HAS_TPM2
select SOC_INTEL_COMMON_BLOCK_TCSS select SOC_INTEL_COMMON_BLOCK_TCSS
select SOC_INTEL_CSE_LITE_SKU select SOC_INTEL_CSE_LITE_SKU
select SOC_INTEL_TIGERLAKE select SOC_INTEL_TIGERLAKE
select SPI_TPM if !BOARD_GOOGLE_VOLTEER2_TI50
select TPM_GOOGLE_TI50 if BOARD_GOOGLE_VOLTEER2_TI50 select TPM_GOOGLE_TI50 if BOARD_GOOGLE_VOLTEER2_TI50
select TPM_GOOGLE_CR50 if !BOARD_GOOGLE_VOLTEER2_TI50 select TPM_GOOGLE_CR50 if !BOARD_GOOGLE_VOLTEER2_TI50
config BOARD_GOOGLE_CHRONICLER
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_COLLIS
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_COPANO
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_DELBIN config BOARD_GOOGLE_DELBIN
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_DROBIT
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select DRIVERS_GENESYSLOGIC_GL9755
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_ELDRID config BOARD_GOOGLE_ELDRID
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_ELEMI
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_HALVOR config BOARD_GOOGLE_HALVOR
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_CAR_NEM select INTEL_CAR_NEM
@ -74,6 +97,15 @@ config BOARD_GOOGLE_TRONDO
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_CAR_NEM select INTEL_CAR_NEM
config BOARD_GOOGLE_VOEMA
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
select VARIANT_HAS_MIPI_CAMERA
config BOARD_GOOGLE_VOLET
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_VOLTEER config BOARD_GOOGLE_VOLTEER
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_CAR_NEM select INTEL_CAR_NEM
@ -101,38 +133,6 @@ config BOARD_GOOGLE_VOXEL
select INTEL_GMA_HAVE_VBT select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_ELEMI
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_VOEMA
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
select VARIANT_HAS_MIPI_CAMERA
config BOARD_GOOGLE_DROBIT
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select DRIVERS_GENESYSLOGIC_GL9755
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_COPANO
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_COLLIS
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_VOLET
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_CHRONICLER
select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
if BOARD_GOOGLE_BASEBOARD_VOLTEER if BOARD_GOOGLE_BASEBOARD_VOLTEER
config CHROMEOS config CHROMEOS
@ -189,50 +189,50 @@ config MAINBOARD_FAMILY
default "Google_Volteer" default "Google_Volteer"
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Chronicler" if BOARD_GOOGLE_CHRONICLER
default "Collis" if BOARD_GOOGLE_COLLIS
default "Copano" if BOARD_GOOGLE_COPANO
default "Delbin" if BOARD_GOOGLE_DELBIN default "Delbin" if BOARD_GOOGLE_DELBIN
default "Drobit" if BOARD_GOOGLE_DROBIT
default "Eldrid" if BOARD_GOOGLE_ELDRID default "Eldrid" if BOARD_GOOGLE_ELDRID
default "Elemi" if BOARD_GOOGLE_ELEMI
default "Halvor" if BOARD_GOOGLE_HALVOR default "Halvor" if BOARD_GOOGLE_HALVOR
default "Lindar" if BOARD_GOOGLE_LINDAR default "Lindar" if BOARD_GOOGLE_LINDAR
default "Malefor" if BOARD_GOOGLE_MALEFOR default "Malefor" if BOARD_GOOGLE_MALEFOR
default "Terrador" if BOARD_GOOGLE_TERRADOR default "Terrador" if BOARD_GOOGLE_TERRADOR
default "Todor" if BOARD_GOOGLE_TODOR default "Todor" if BOARD_GOOGLE_TODOR
default "Trondo" if BOARD_GOOGLE_TRONDO default "Trondo" if BOARD_GOOGLE_TRONDO
default "Voema" if BOARD_GOOGLE_VOEMA
default "Volet" if BOARD_GOOGLE_VOLET
default "Volteer" if BOARD_GOOGLE_VOLTEER default "Volteer" if BOARD_GOOGLE_VOLTEER
default "Volteer2" if BOARD_GOOGLE_VOLTEER2 default "Volteer2" if BOARD_GOOGLE_VOLTEER2
default "Volteer2_Ti50" if BOARD_GOOGLE_VOLTEER2_TI50 default "Volteer2_Ti50" if BOARD_GOOGLE_VOLTEER2_TI50
default "Voxel" if BOARD_GOOGLE_VOXEL default "Voxel" if BOARD_GOOGLE_VOXEL
default "Elemi" if BOARD_GOOGLE_ELEMI
default "Voema" if BOARD_GOOGLE_VOEMA
default "Drobit" if BOARD_GOOGLE_DROBIT
default "Copano" if BOARD_GOOGLE_COPANO
default "Collis" if BOARD_GOOGLE_COLLIS
default "Volet" if BOARD_GOOGLE_VOLET
default "Chronicler" if BOARD_GOOGLE_CHRONICLER
config TPM_TIS_ACPI_INTERRUPT config TPM_TIS_ACPI_INTERRUPT
int int
default 21 # GPE0_DW0_21 (GPP_C21) default 21 # GPE0_DW0_21 (GPP_C21)
config VARIANT_DIR config VARIANT_DIR
default "chronicler" if BOARD_GOOGLE_CHRONICLER
default "collis" if BOARD_GOOGLE_COLLIS
default "copano" if BOARD_GOOGLE_COPANO
default "delbin" if BOARD_GOOGLE_DELBIN default "delbin" if BOARD_GOOGLE_DELBIN
default "drobit" if BOARD_GOOGLE_DROBIT
default "eldrid" if BOARD_GOOGLE_ELDRID default "eldrid" if BOARD_GOOGLE_ELDRID
default "elemi" if BOARD_GOOGLE_ELEMI
default "halvor" if BOARD_GOOGLE_HALVOR default "halvor" if BOARD_GOOGLE_HALVOR
default "lindar" if BOARD_GOOGLE_LINDAR default "lindar" if BOARD_GOOGLE_LINDAR
default "malefor" if BOARD_GOOGLE_MALEFOR default "malefor" if BOARD_GOOGLE_MALEFOR
default "terrador" if BOARD_GOOGLE_TERRADOR default "terrador" if BOARD_GOOGLE_TERRADOR
default "todor" if BOARD_GOOGLE_TODOR default "todor" if BOARD_GOOGLE_TODOR
default "trondo" if BOARD_GOOGLE_TRONDO default "trondo" if BOARD_GOOGLE_TRONDO
default "voema" if BOARD_GOOGLE_VOEMA
default "volet" if BOARD_GOOGLE_VOLET
default "volteer" if BOARD_GOOGLE_VOLTEER default "volteer" if BOARD_GOOGLE_VOLTEER
default "volteer2" if BOARD_GOOGLE_VOLTEER2 default "volteer2" if BOARD_GOOGLE_VOLTEER2
default "volteer2" if BOARD_GOOGLE_VOLTEER2_TI50 default "volteer2" if BOARD_GOOGLE_VOLTEER2_TI50
default "voxel" if BOARD_GOOGLE_VOXEL default "voxel" if BOARD_GOOGLE_VOXEL
default "elemi" if BOARD_GOOGLE_ELEMI
default "voema" if BOARD_GOOGLE_VOEMA
default "drobit" if BOARD_GOOGLE_DROBIT
default "copano" if BOARD_GOOGLE_COPANO
default "collis" if BOARD_GOOGLE_COLLIS
default "volet" if BOARD_GOOGLE_VOLET
default "chronicler" if BOARD_GOOGLE_CHRONICLER
config VARIANT_HAS_MIPI_CAMERA config VARIANT_HAS_MIPI_CAMERA
bool bool

View File

@ -1,11 +1,26 @@
comment "Volteer" comment "Volteer"
config BOARD_GOOGLE_CHRONICLER
bool "-> Chronicler"
config BOARD_GOOGLE_COLLIS
bool "-> Collis"
config BOARD_GOOGLE_COPANO
bool "-> Copano (ASUS Chromebook Flip CX5400)"
config BOARD_GOOGLE_DELBIN config BOARD_GOOGLE_DELBIN
bool "-> Delbin (ASUS Chromebook Flip CX5)" bool "-> Delbin (ASUS Chromebook Flip CX5)"
config BOARD_GOOGLE_DROBIT
bool "-> Drobit (ASUS Chromebook CX9400)"
config BOARD_GOOGLE_ELDRID config BOARD_GOOGLE_ELDRID
bool "-> Eldrid" bool "-> Eldrid"
config BOARD_GOOGLE_ELEMI
bool "-> Elemi (HP Pro c640 G2 Chromebook)"
config BOARD_GOOGLE_HALVOR config BOARD_GOOGLE_HALVOR
bool "-> Halvor" bool "-> Halvor"
@ -24,6 +39,12 @@ config BOARD_GOOGLE_TODOR
config BOARD_GOOGLE_TRONDO config BOARD_GOOGLE_TRONDO
bool "-> Trondo" bool "-> Trondo"
config BOARD_GOOGLE_VOEMA
bool "-> Voema"
config BOARD_GOOGLE_VOLET
bool "-> Volet"
config BOARD_GOOGLE_VOLTEER config BOARD_GOOGLE_VOLTEER
bool "-> Volteer" bool "-> Volteer"
@ -36,24 +57,3 @@ config BOARD_GOOGLE_VOLTEER2_TI50
config BOARD_GOOGLE_VOXEL config BOARD_GOOGLE_VOXEL
bool "-> Voxel (Acer Chromebook Spin 713 (CP713-3W))" bool "-> Voxel (Acer Chromebook Spin 713 (CP713-3W))"
config BOARD_GOOGLE_ELEMI
bool "-> Elemi (HP Pro c640 G2 Chromebook)"
config BOARD_GOOGLE_VOEMA
bool "-> Voema"
config BOARD_GOOGLE_DROBIT
bool "-> Drobit (ASUS Chromebook CX9400)"
config BOARD_GOOGLE_COPANO
bool "-> Copano (ASUS Chromebook Flip CX5400)"
config BOARD_GOOGLE_COLLIS
bool "-> Collis"
config BOARD_GOOGLE_VOLET
bool "-> Volet"
config BOARD_GOOGLE_CHRONICLER
bool "-> Chronicler"