From 1a4b132413cacadd17b66add6758d24036a1c283 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Sun, 14 Nov 2021 19:12:22 -0600 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59327 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/octopus/Kconfig | 1 - src/mainboard/google/octopus/Kconfig.name | 10 ++++++++++ src/mainboard/google/octopus/variants/bloog/Makefile.inc | 2 ++ .../google/octopus/variants/bloog/blooguard-data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/bloog/data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/bobba/data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/casta/data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/fleex/data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/garg/Makefile.inc | 4 ++++ src/mainboard/google/octopus/variants/garg/data.vbt | Bin 0 -> 5632 bytes .../google/octopus/variants/garg/garfour-data.vbt | Bin 0 -> 5632 bytes .../google/octopus/variants/garg/garfour-hdmi-data.vbt | Bin 0 -> 5632 bytes .../google/octopus/variants/garg/garg-hdmi-data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/lick/data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/meep/Makefile.inc | 3 +++ src/mainboard/google/octopus/variants/meep/data.vbt | Bin 0 -> 5632 bytes .../google/octopus/variants/meep/dorp-hdmi-data.vbt | Bin 0 -> 5632 bytes .../google/octopus/variants/meep/vortininja-data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/phaser/data.vbt | Bin 0 -> 5632 bytes src/mainboard/google/octopus/variants/yorp/data.vbt | Bin 0 -> 5632 bytes 20 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/mainboard/google/octopus/variants/bloog/blooguard-data.vbt create mode 100644 src/mainboard/google/octopus/variants/bloog/data.vbt create mode 100644 src/mainboard/google/octopus/variants/bobba/data.vbt create mode 100644 src/mainboard/google/octopus/variants/casta/data.vbt create mode 100644 src/mainboard/google/octopus/variants/fleex/data.vbt create mode 100644 src/mainboard/google/octopus/variants/garg/data.vbt create mode 100644 src/mainboard/google/octopus/variants/garg/garfour-data.vbt create mode 100644 src/mainboard/google/octopus/variants/garg/garfour-hdmi-data.vbt create mode 100644 src/mainboard/google/octopus/variants/garg/garg-hdmi-data.vbt create mode 100644 src/mainboard/google/octopus/variants/lick/data.vbt create mode 100644 src/mainboard/google/octopus/variants/meep/data.vbt create mode 100644 src/mainboard/google/octopus/variants/meep/dorp-hdmi-data.vbt create mode 100644 src/mainboard/google/octopus/variants/meep/vortininja-data.vbt create mode 100644 src/mainboard/google/octopus/variants/phaser/data.vbt create mode 100644 src/mainboard/google/octopus/variants/yorp/data.vbt (limited to 'src/mainboard') diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index eb6cbc6efc..25d08eb8c5 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -18,7 +18,6 @@ config BOARD_GOOGLE_BASEBOARD_OCTOPUS 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 4fcc3e1fd2..4168411b31 100644 --- a/src/mainboard/google/octopus/Kconfig.name +++ b/src/mainboard/google/octopus/Kconfig.name @@ -4,12 +4,14 @@ config BOARD_GOOGLE_AMPTON 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 @@ config BOARD_GOOGLE_BOBBA 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 @@ config BOARD_GOOGLE_CASTA 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 @@ config BOARD_GOOGLE_FLEEX 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 @@ config BOARD_GOOGLE_GARG 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 @@ config BOARD_GOOGLE_LICK 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 @@ config BOARD_GOOGLE_PHASER 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 @@ config BOARD_GOOGLE_YORP 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 ba865e9f82..98c1e441b0 100644 --- a/src/mainboard/google/octopus/variants/bloog/Makefile.inc +++ b/src/mainboard/google/octopus/variants/bloog/Makefile.inc @@ -2,3 +2,5 @@ bootblock-y += gpio.c 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 0000000000..1d93571b5f Binary files /dev/null and b/src/mainboard/google/octopus/variants/bloog/blooguard-data.vbt 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 0000000000..fbcf46e849 Binary files /dev/null and b/src/mainboard/google/octopus/variants/bloog/data.vbt 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 0000000000..fbcf46e849 Binary files /dev/null and b/src/mainboard/google/octopus/variants/bobba/data.vbt 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 0000000000..fbcf46e849 Binary files /dev/null and b/src/mainboard/google/octopus/variants/casta/data.vbt 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 0000000000..2848abe033 Binary files /dev/null and b/src/mainboard/google/octopus/variants/fleex/data.vbt differ diff --git a/src/mainboard/google/octopus/variants/garg/Makefile.inc b/src/mainboard/google/octopus/variants/garg/Makefile.inc index 7ee7e70d4b..a443e8d398 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 += gpio.c 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 0000000000..fbcf46e849 Binary files /dev/null and b/src/mainboard/google/octopus/variants/garg/data.vbt 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 0000000000..1d93571b5f Binary files /dev/null and b/src/mainboard/google/octopus/variants/garg/garfour-data.vbt 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 0000000000..abf1d8848e Binary files /dev/null and b/src/mainboard/google/octopus/variants/garg/garfour-hdmi-data.vbt 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 0000000000..2073536009 Binary files /dev/null and b/src/mainboard/google/octopus/variants/garg/garg-hdmi-data.vbt 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 0000000000..fbcf46e849 Binary files /dev/null and b/src/mainboard/google/octopus/variants/lick/data.vbt differ diff --git a/src/mainboard/google/octopus/variants/meep/Makefile.inc b/src/mainboard/google/octopus/variants/meep/Makefile.inc index ba865e9f82..7a6301c01b 100644 --- a/src/mainboard/google/octopus/variants/meep/Makefile.inc +++ b/src/mainboard/google/octopus/variants/meep/Makefile.inc @@ -2,3 +2,6 @@ bootblock-y += gpio.c 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 0000000000..fbcf46e849 Binary files /dev/null and b/src/mainboard/google/octopus/variants/meep/data.vbt 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 0000000000..ac58bd4e0c Binary files /dev/null and b/src/mainboard/google/octopus/variants/meep/dorp-hdmi-data.vbt 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 0000000000..1d93571b5f Binary files /dev/null and b/src/mainboard/google/octopus/variants/meep/vortininja-data.vbt 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 0000000000..fbcf46e849 Binary files /dev/null and b/src/mainboard/google/octopus/variants/phaser/data.vbt 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 0000000000..764ee940ed Binary files /dev/null and b/src/mainboard/google/octopus/variants/yorp/data.vbt differ -- cgit v1.2.3