diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2018-12-25 18:12:41 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-05-10 15:14:32 +0000 |
| commit | 9d9ce62ae9bd122e43ab87468de541a822a0ff1f (patch) | |
| tree | 7b454354bbd9588f3eda866fa577b69ac49fb90c | |
| parent | 1360b9a73f5389efd94f0de36588d71f6f8cd1d1 (diff) | |
mb/google/nami: Add VBT blobs and include them in cbfs
Add vbt files for nami variants and select Kconfig option
to utilize them. The default vbt is automatically added
by the Kconfig selection and so does not need to be
specified in the makefile with the others.
Test: boot vayne and akali nami variants, verify
display functional and correct vbt loaded.
Change-Id: Iaf49bdee7ae82a0a61192327351267f098eb5ab1
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/30427
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/akali-data.vbt (renamed from src/mainboard/google/poppy/variants/nami/vbt-akali.bin) | bin | 4608 -> 4608 bytes | |||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/data.vbt | bin | 0 -> 4608 bytes | |||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/pantheon-data.vbt | bin | 0 -> 4608 bytes | |||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/vayne-data.vbt | bin | 0 -> 4608 bytes |
6 files changed, 4 insertions, 0 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index b7f479f888..6bc8269aa7 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -10,6 +10,7 @@ config BOARD_GOOGLE_BASEBOARD_POPPY select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES + select INTEL_GMA_HAVE_VBT if BOARD_GOOGLE_NAMI select INTEL_LPSS_UART_FOR_CONSOLE select MAINBOARD_HAS_CHROMEOS select MAINBOARD_USES_FSP2_0 diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc index dc80357835..0033c60ee7 100644 --- a/src/mainboard/google/poppy/variants/nami/Makefile.inc +++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc @@ -43,3 +43,6 @@ oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE)) oem.bin-type := raw $(call add_vbt_to_cbfs, vbt-bard.bin, bard-data.vbt) +$(call add_vbt_to_cbfs, vbt-akali.bin, akali-data.vbt) +$(call add_vbt_to_cbfs, vbt-pantheon.bin, pantheon-data.vbt) +$(call add_vbt_to_cbfs, vbt-vayne.bin, vayne-data.vbt) diff --git a/src/mainboard/google/poppy/variants/nami/vbt-akali.bin b/src/mainboard/google/poppy/variants/nami/akali-data.vbt Binary files differindex 8ca87dd3bc..8ca87dd3bc 100644 --- a/src/mainboard/google/poppy/variants/nami/vbt-akali.bin +++ b/src/mainboard/google/poppy/variants/nami/akali-data.vbt diff --git a/src/mainboard/google/poppy/variants/nami/data.vbt b/src/mainboard/google/poppy/variants/nami/data.vbt Binary files differnew file mode 100644 index 0000000000..84063621d0 --- /dev/null +++ b/src/mainboard/google/poppy/variants/nami/data.vbt diff --git a/src/mainboard/google/poppy/variants/nami/pantheon-data.vbt b/src/mainboard/google/poppy/variants/nami/pantheon-data.vbt Binary files differnew file mode 100644 index 0000000000..7e4fb0afe5 --- /dev/null +++ b/src/mainboard/google/poppy/variants/nami/pantheon-data.vbt diff --git a/src/mainboard/google/poppy/variants/nami/vayne-data.vbt b/src/mainboard/google/poppy/variants/nami/vayne-data.vbt Binary files differnew file mode 100644 index 0000000000..7e4fb0afe5 --- /dev/null +++ b/src/mainboard/google/poppy/variants/nami/vayne-data.vbt |