Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/61685 )
Change subject: mb/google/reef: Add VBTs for all variants ......................................................................
mb/google/reef: Add VBTs for all variants
Adjust Kconfig so all variants use proper VBTs. Add Makefile entries for variants which use multiple VBTs.
extracted from ChromeOS firmwares: Google_Coral.10068.113.0 Google_Pyro.9042.233.0 Google_Reef.9042.233.0 Google_Sand.9042.220.0 Google_Snappy.9042.253.0
Change-Id: I46ad4ec321e32d019e44f0741956b18a464fb8ae Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M src/mainboard/google/reef/Kconfig M src/mainboard/google/reef/variants/coral/Makefile.inc R src/mainboard/google/reef/variants/coral/astronaut-data.vbt C src/mainboard/google/reef/variants/coral/babymega-data.vbt C src/mainboard/google/reef/variants/coral/babytiger-data.vbt C src/mainboard/google/reef/variants/coral/data.vbt C src/mainboard/google/reef/variants/coral/epaulette-data.vbt C src/mainboard/google/reef/variants/coral/nasher-data.vbt C src/mainboard/google/reef/variants/coral/rabbid_rugged-data.vbt C src/mainboard/google/reef/variants/coral/santa-data.vbt C src/mainboard/google/reef/variants/pyro/data.vbt C src/mainboard/google/reef/variants/reef/data.vbt C src/mainboard/google/reef/variants/sand/data.vbt C src/mainboard/google/reef/variants/snappy/data.vbt 14 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/61685/1
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 7b65f71..3f5a21d 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -111,8 +111,4 @@ config FMDFILE default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/default.fmd" if !CHROMEOS
-# Override the default behavior, since the data.vbt is the same for all variants -config INTEL_GMA_VBT_FILE - default "src/mainboard/$(MAINBOARDDIR)/data.vbt" - endif # BOARD_GOOGLE_REEF diff --git a/src/mainboard/google/reef/variants/coral/Makefile.inc b/src/mainboard/google/reef/variants/coral/Makefile.inc index e52d959..440ec9c 100644 --- a/src/mainboard/google/reef/variants/coral/Makefile.inc +++ b/src/mainboard/google/reef/variants/coral/Makefile.inc @@ -4,3 +4,11 @@ ramstage-y += gpio.c
smm-y += gpio.c + +$(call add_vbt_to_cbfs, vbt-astronaut.bin, astronaut-data.vbt) +$(call add_vbt_to_cbfs, vbt-babytiger.bin, babytiger-data.vbt) +$(call add_vbt_to_cbfs, vbt-babymega.bin, babymega-data.vbt) +$(call add_vbt_to_cbfs, vbt-epaulette.bin, epaulette-data.vbt) +$(call add_vbt_to_cbfs, vbt-nasher.bin, nasher-data.vbt) +$(call add_vbt_to_cbfs, vbt-rabbid_rugged.bin, rabbid_rugged-data.vbt) +$(call add_vbt_to_cbfs, vbt-santa.bin, santa-data.vbt) diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/astronaut-data.vbt similarity index 97% rename from src/mainboard/google/reef/data.vbt rename to src/mainboard/google/reef/variants/coral/astronaut-data.vbt index d9a55d2..6b4109e 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/astronaut-data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/babymega-data.vbt similarity index 95% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/coral/babymega-data.vbt index d9a55d2..6570620 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/babymega-data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/babytiger-data.vbt similarity index 95% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/coral/babytiger-data.vbt index d9a55d2..6570620 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/babytiger-data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/data.vbt similarity index 97% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/coral/data.vbt index d9a55d2..2da3a79 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/epaulette-data.vbt similarity index 97% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/coral/epaulette-data.vbt index d9a55d2..6b4109e 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/epaulette-data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/nasher-data.vbt similarity index 95% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/coral/nasher-data.vbt index d9a55d2..b7122fa 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/nasher-data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/rabbid_rugged-data.vbt similarity index 95% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/coral/rabbid_rugged-data.vbt index d9a55d2..e26cfda 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/rabbid_rugged-data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/coral/santa-data.vbt similarity index 97% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/coral/santa-data.vbt index d9a55d2..6b4109e 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/coral/santa-data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/pyro/data.vbt similarity index 96% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/pyro/data.vbt index d9a55d2..472ac11 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/pyro/data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/reef/data.vbt similarity index 97% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/reef/data.vbt index d9a55d2..2da3a79 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/reef/data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/sand/data.vbt similarity index 97% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/sand/data.vbt index d9a55d2..2da3a79 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/sand/data.vbt Binary files differ diff --git a/src/mainboard/google/reef/data.vbt b/src/mainboard/google/reef/variants/snappy/data.vbt similarity index 97% copy from src/mainboard/google/reef/data.vbt copy to src/mainboard/google/reef/variants/snappy/data.vbt index d9a55d2..2da3a79 100644 --- a/src/mainboard/google/reef/data.vbt +++ b/src/mainboard/google/reef/variants/snappy/data.vbt Binary files differ