From 9d9ce62ae9bd122e43ab87468de541a822a0ff1f Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 25 Dec 2018 18:12:41 +0100 Subject: 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 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/30427 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/google/poppy/Kconfig | 1 + src/mainboard/google/poppy/variants/nami/Makefile.inc | 3 +++ src/mainboard/google/poppy/variants/nami/akali-data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/poppy/variants/nami/data.vbt | Bin 0 -> 4608 bytes .../google/poppy/variants/nami/pantheon-data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/poppy/variants/nami/vayne-data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/poppy/variants/nami/vbt-akali.bin | Bin 4608 -> 0 bytes 7 files changed, 4 insertions(+) create mode 100644 src/mainboard/google/poppy/variants/nami/akali-data.vbt create mode 100644 src/mainboard/google/poppy/variants/nami/data.vbt create mode 100644 src/mainboard/google/poppy/variants/nami/pantheon-data.vbt create mode 100644 src/mainboard/google/poppy/variants/nami/vayne-data.vbt delete mode 100644 src/mainboard/google/poppy/variants/nami/vbt-akali.bin (limited to 'src/mainboard') 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/akali-data.vbt b/src/mainboard/google/poppy/variants/nami/akali-data.vbt new file mode 100644 index 0000000000..8ca87dd3bc Binary files /dev/null and b/src/mainboard/google/poppy/variants/nami/akali-data.vbt differ diff --git a/src/mainboard/google/poppy/variants/nami/data.vbt b/src/mainboard/google/poppy/variants/nami/data.vbt new file mode 100644 index 0000000000..84063621d0 Binary files /dev/null and b/src/mainboard/google/poppy/variants/nami/data.vbt differ diff --git a/src/mainboard/google/poppy/variants/nami/pantheon-data.vbt b/src/mainboard/google/poppy/variants/nami/pantheon-data.vbt new file mode 100644 index 0000000000..7e4fb0afe5 Binary files /dev/null and b/src/mainboard/google/poppy/variants/nami/pantheon-data.vbt differ diff --git a/src/mainboard/google/poppy/variants/nami/vayne-data.vbt b/src/mainboard/google/poppy/variants/nami/vayne-data.vbt new file mode 100644 index 0000000000..7e4fb0afe5 Binary files /dev/null and b/src/mainboard/google/poppy/variants/nami/vayne-data.vbt differ diff --git a/src/mainboard/google/poppy/variants/nami/vbt-akali.bin b/src/mainboard/google/poppy/variants/nami/vbt-akali.bin deleted file mode 100644 index 8ca87dd3bc..0000000000 Binary files a/src/mainboard/google/poppy/variants/nami/vbt-akali.bin and /dev/null differ -- cgit v1.2.3