mb/google/volteer: Add VBT data files for variants

Add data.vbt files for all variants supported by current volteer
recovery image. Several boards use the same VBT, so place the "common"
VBT under the baseboard directory and set it as the default.
For variants with a unique VBT, override the default and use the file in
their respective variant directory. Select INTEL_GMA_HAVE_VBT for all
variants which have a VBT file.

TEST=build/boot various volteer variants

Change-Id: I728ab81938c78f600ff8931a8073d1f7de152c09
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74852
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Matt DeVillier 2023-04-28 10:21:02 -05:00 committed by Matt DeVillier
parent 71fee41ef5
commit 7e6f323d98
4 changed files with 16 additions and 0 deletions

View File

@ -41,9 +41,11 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
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
config BOARD_GOOGLE_ELDRID config BOARD_GOOGLE_ELDRID
select BOARD_GOOGLE_BASEBOARD_VOLTEER 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
@ -82,6 +84,7 @@ config BOARD_GOOGLE_VOLTEER2
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select DRIVER_I2C_TPM_ACPI select DRIVER_I2C_TPM_ACPI
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
select VARIANT_HAS_MIPI_CAMERA select VARIANT_HAS_MIPI_CAMERA
@ -95,32 +98,40 @@ config BOARD_GOOGLE_VOLTEER2_TI50
config BOARD_GOOGLE_VOXEL config BOARD_GOOGLE_VOXEL
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_ELEMI config BOARD_GOOGLE_ELEMI
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_VOEMA config BOARD_GOOGLE_VOEMA
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
select VARIANT_HAS_MIPI_CAMERA select VARIANT_HAS_MIPI_CAMERA
config BOARD_GOOGLE_DROBIT config BOARD_GOOGLE_DROBIT
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select DRIVERS_GENESYSLOGIC_GL9755 select DRIVERS_GENESYSLOGIC_GL9755
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_COPANO config BOARD_GOOGLE_COPANO
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
config BOARD_GOOGLE_COLLIS config BOARD_GOOGLE_COLLIS
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_VOLET config BOARD_GOOGLE_VOLET
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
config BOARD_GOOGLE_CHRONICLER config BOARD_GOOGLE_CHRONICLER
select BOARD_GOOGLE_BASEBOARD_VOLTEER select BOARD_GOOGLE_BASEBOARD_VOLTEER
select INTEL_GMA_HAVE_VBT
if BOARD_GOOGLE_BASEBOARD_VOLTEER if BOARD_GOOGLE_BASEBOARD_VOLTEER
@ -165,6 +176,11 @@ config DRIVER_TPM_I2C_ADDR
hex hex
default 0x50 default 0x50
config INTEL_GMA_VBT_FILE
default "src/mainboard/\$(MAINBOARDDIR)/variants/\$(VARIANT_DIR)/data.vbt" \
if BOARD_GOOGLE_ELEMI || BOARD_GOOGLE_LINDAR || BOARD_GOOGLE_VOEMA
default "src/mainboard/\$(MAINBOARDDIR)/variants/baseboard/data.vbt" if INTEL_GMA_HAVE_VBT
config MAINBOARD_DIR config MAINBOARD_DIR
default "google/volteer" default "google/volteer"

Binary file not shown.

Binary file not shown.