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>

4 files changed, 16 insertions, 0 deletions

diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 51210e44ed..c4d6f4a82e 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -41,9 +41,11 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
 config BOARD_GOOGLE_DELBIN
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select DRIVERS_GENESYSLOGIC_GL9755
+	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_ELDRID
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
+	select INTEL_GMA_HAVE_VBT
 
 config BOARD_GOOGLE_HALVOR
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
@@ -82,6 +84,7 @@ config BOARD_GOOGLE_VOLTEER2
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select DRIVER_I2C_TPM_ACPI
 	select DRIVERS_GENESYSLOGIC_GL9755
+	select INTEL_GMA_HAVE_VBT
 	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
 	select VARIANT_HAS_MIPI_CAMERA
 
@@ -95,32 +98,40 @@ config BOARD_GOOGLE_VOLTEER2_TI50
 config BOARD_GOOGLE_VOXEL
 	select BOARD_GOOGLE_BASEBOARD_VOLTEER
 	select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
+	select INTEL_GMA_HAVE_VBT
 	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
 
@@ -165,6 +176,11 @@ config DRIVER_TPM_I2C_ADDR
 	hex
 	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
 	default "google/volteer"
 
diff --git a/src/mainboard/google/volteer/variants/baseboard/data.vbt b/src/mainboard/google/volteer/variants/baseboard/data.vbt
new file mode 100644
index 0000000000..a7cd7da8b6
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/baseboard/data.vbt
diff --git a/src/mainboard/google/volteer/variants/elemi/data.vbt b/src/mainboard/google/volteer/variants/elemi/data.vbt
new file mode 100644
index 0000000000..f3597e289a
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/elemi/data.vbt
diff --git a/src/mainboard/google/volteer/variants/voema/data.vbt b/src/mainboard/google/volteer/variants/voema/data.vbt
new file mode 100644
index 0000000000..6242c7fd25
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/voema/data.vbt