[coreboot-gerrit] [S] Change in coreboot[master]: mb/google/volteer: Add VBT data files for variants

[Matt DeVillier (Code Review)]

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/74852 )

Change subject: mb/google/volteer: Add VBT data files for variants
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74852
Reviewed-by: Nico Huber 
Reviewed-by: Sean Rhodes 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/volteer/Kconfig
A src/mainboard/google/volteer/variants/baseboard/data.vbt
A src/mainboard/google/volteer/variants/elemi/data.vbt
A src/mainboard/google/volteer/variants/voema/data.vbt
4 files changed, 39 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, but someone else must approve
  Sean Rhodes: Looks good to me, approved

diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig
index 51210e4..c4d6f4a 100644
--- a/src/mainboard/google/volteer/Kconfig
+++ b/src/mainboard/google/volteer/Kconfig
@@ -41,9 +41,11 @@
 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 @@
    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_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 @@
    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 0000000..a7cd7da
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/baseboard/data.vbt
Binary files differ
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 0000000..f3597e2
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/elemi/data.vbt
Binary files differ
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 0000000..6242c7fd
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/voema/data.vbt
Binary files differ