Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59327 )
Change subject: mb/google/octopus: Add missing VBTs for variants ......................................................................
mb/google/octopus: Add missing VBTs for variants
Add VBTs for all octopus variants currently supported by ChromeOS recovery images. For variants which use multiple VBTs and select at runtime, ensure these are added directly to CBFS.
Change-Id: I4b5c4268f9255d658f9762d94488db66e0677830 Signed-off-by: Matt DeVillier matt.devillier@gmail.com --- M src/mainboard/google/octopus/Kconfig M src/mainboard/google/octopus/Kconfig.name M src/mainboard/google/octopus/variants/bloog/Makefile.inc A src/mainboard/google/octopus/variants/bloog/blooguard-data.vbt A src/mainboard/google/octopus/variants/bloog/data.vbt A src/mainboard/google/octopus/variants/bobba/data.vbt A src/mainboard/google/octopus/variants/casta/data.vbt A src/mainboard/google/octopus/variants/fleex/data.vbt M src/mainboard/google/octopus/variants/garg/Makefile.inc A src/mainboard/google/octopus/variants/garg/data.vbt A src/mainboard/google/octopus/variants/garg/garfour-data.vbt A src/mainboard/google/octopus/variants/garg/garfour-hdmi-data.vbt A src/mainboard/google/octopus/variants/garg/garg-hdmi-data.vbt A src/mainboard/google/octopus/variants/lick/data.vbt M src/mainboard/google/octopus/variants/meep/Makefile.inc A src/mainboard/google/octopus/variants/meep/data.vbt A src/mainboard/google/octopus/variants/meep/dorp-hdmi-data.vbt A src/mainboard/google/octopus/variants/meep/vortininja-data.vbt A src/mainboard/google/octopus/variants/phaser/data.vbt A src/mainboard/google/octopus/variants/yorp/data.vbt 20 files changed, 19 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/59327/1
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index eb6cbc6..25d08eb8 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -18,7 +18,6 @@ select EC_GOOGLE_CHROMEEC_ESPI select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES - select INTEL_GMA_HAVE_VBT if BOARD_GOOGLE_AMPTON select INTEL_LPSS_UART_FOR_CONSOLE select MAINBOARD_HAS_CHROMEOS select SOC_ESPI diff --git a/src/mainboard/google/octopus/Kconfig.name b/src/mainboard/google/octopus/Kconfig.name index 4fcc3e1..4168411 100644 --- a/src/mainboard/google/octopus/Kconfig.name +++ b/src/mainboard/google/octopus/Kconfig.name @@ -4,12 +4,14 @@ bool "-> Ampton (ASUS Chromebook Flip C214)" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_BLOOG bool "-> Bloog (HP Chromebook x360 12b, 14a, x360 14b)" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
@@ -17,6 +19,7 @@ bool "-> Bobba (Acer Chromebook 311 / Spin 511)" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
@@ -24,6 +27,7 @@ bool "-> Bluebird/Casta (Samsung Chromebook 4, 4+)" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_DOOD @@ -36,6 +40,7 @@ bool "-> Fleex (Dell Chromebook 3100)" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
@@ -49,6 +54,7 @@ bool "-> Garg" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
@@ -56,12 +62,14 @@ bool "-> Lick (Ideapad 3 Chromebook)" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_MEEP bool "-> Meep (HP Chromebook x360 11 G2 EE)" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
@@ -74,6 +82,7 @@ bool "-> Phaser (Lenovo 100e/300e/500e Chromebook 2nd Gen (Intel))" select BASEBOARD_OCTOPUS_LAPTOP select BOARD_GOOGLE_BASEBOARD_OCTOPUS + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
@@ -81,4 +90,5 @@ bool "-> Yorp" select BOARD_GOOGLE_BASEBOARD_OCTOPUS select BASEBOARD_OCTOPUS_LAPTOP + select INTEL_GMA_HAVE_VBT select NHLT_DA7219 if INCLUDE_NHLT_BLOBS diff --git a/src/mainboard/google/octopus/variants/bloog/Makefile.inc b/src/mainboard/google/octopus/variants/bloog/Makefile.inc index ba865e9..98c1e44 100644 --- a/src/mainboard/google/octopus/variants/bloog/Makefile.inc +++ b/src/mainboard/google/octopus/variants/bloog/Makefile.inc @@ -2,3 +2,5 @@
ramstage-y += gpio.c ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt_blooguard.bin, blooguard-data.vbt) diff --git a/src/mainboard/google/octopus/variants/bloog/blooguard-data.vbt b/src/mainboard/google/octopus/variants/bloog/blooguard-data.vbt new file mode 100644 index 0000000..1d93571 --- /dev/null +++ b/src/mainboard/google/octopus/variants/bloog/blooguard-data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/bloog/data.vbt b/src/mainboard/google/octopus/variants/bloog/data.vbt new file mode 100644 index 0000000..fbcf46e --- /dev/null +++ b/src/mainboard/google/octopus/variants/bloog/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/bobba/data.vbt b/src/mainboard/google/octopus/variants/bobba/data.vbt new file mode 100644 index 0000000..fbcf46e --- /dev/null +++ b/src/mainboard/google/octopus/variants/bobba/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/casta/data.vbt b/src/mainboard/google/octopus/variants/casta/data.vbt new file mode 100644 index 0000000..fbcf46e --- /dev/null +++ b/src/mainboard/google/octopus/variants/casta/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/fleex/data.vbt b/src/mainboard/google/octopus/variants/fleex/data.vbt new file mode 100644 index 0000000..2848abe --- /dev/null +++ b/src/mainboard/google/octopus/variants/fleex/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/garg/Makefile.inc b/src/mainboard/google/octopus/variants/garg/Makefile.inc index 7ee7e70..a443e8d 100644 --- a/src/mainboard/google/octopus/variants/garg/Makefile.inc +++ b/src/mainboard/google/octopus/variants/garg/Makefile.inc @@ -4,3 +4,7 @@ ramstage-y += variant.c
smm-y += variant.c + +$(call add_vbt_to_cbfs, vbt_garg_hdmi.bin, garg-hdmi-data.vbt) +$(call add_vbt_to_cbfs, vbt_garfour.bin, garfour-data.vbt) +$(call add_vbt_to_cbfs, vbt_garfour_hdmi.bin, garfour-hdmi-data.vbt) diff --git a/src/mainboard/google/octopus/variants/garg/data.vbt b/src/mainboard/google/octopus/variants/garg/data.vbt new file mode 100644 index 0000000..fbcf46e --- /dev/null +++ b/src/mainboard/google/octopus/variants/garg/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/garg/garfour-data.vbt b/src/mainboard/google/octopus/variants/garg/garfour-data.vbt new file mode 100644 index 0000000..1d93571 --- /dev/null +++ b/src/mainboard/google/octopus/variants/garg/garfour-data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/garg/garfour-hdmi-data.vbt b/src/mainboard/google/octopus/variants/garg/garfour-hdmi-data.vbt new file mode 100644 index 0000000..abf1d88 --- /dev/null +++ b/src/mainboard/google/octopus/variants/garg/garfour-hdmi-data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/garg/garg-hdmi-data.vbt b/src/mainboard/google/octopus/variants/garg/garg-hdmi-data.vbt new file mode 100644 index 0000000..2073536 --- /dev/null +++ b/src/mainboard/google/octopus/variants/garg/garg-hdmi-data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/lick/data.vbt b/src/mainboard/google/octopus/variants/lick/data.vbt new file mode 100644 index 0000000..fbcf46e --- /dev/null +++ b/src/mainboard/google/octopus/variants/lick/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc index ba865e9..7a6301c 100644 --- a/src/mainboard/google/octopus/variants/meep/Makefile.inc +++ b/src/mainboard/google/octopus/variants/meep/Makefile.inc @@ -2,3 +2,6 @@
ramstage-y += gpio.c ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt_dorp_hdmi.bin, dorp-hdmi-data.vbt) +$(call add_vbt_to_cbfs, vbt_vortininja.bin, vortininja-data.vbt) diff --git a/src/mainboard/google/octopus/variants/meep/data.vbt b/src/mainboard/google/octopus/variants/meep/data.vbt new file mode 100644 index 0000000..fbcf46e --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/meep/dorp-hdmi-data.vbt b/src/mainboard/google/octopus/variants/meep/dorp-hdmi-data.vbt new file mode 100644 index 0000000..ac58bd4 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/dorp-hdmi-data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/meep/vortininja-data.vbt b/src/mainboard/google/octopus/variants/meep/vortininja-data.vbt new file mode 100644 index 0000000..1d93571 --- /dev/null +++ b/src/mainboard/google/octopus/variants/meep/vortininja-data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/phaser/data.vbt b/src/mainboard/google/octopus/variants/phaser/data.vbt new file mode 100644 index 0000000..fbcf46e --- /dev/null +++ b/src/mainboard/google/octopus/variants/phaser/data.vbt Binary files differ diff --git a/src/mainboard/google/octopus/variants/yorp/data.vbt b/src/mainboard/google/octopus/variants/yorp/data.vbt new file mode 100644 index 0000000..764ee94 --- /dev/null +++ b/src/mainboard/google/octopus/variants/yorp/data.vbt Binary files differ