From 2d086e6971fc5bed9e5a6c028ca8601d2499fd82 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 29 Nov 2019 13:05:11 -0600 Subject: mb/google/glados: restore device-specific VBTs When migrating glados (and variants) to FSP 2.0, the older board- specific VBTs were dropped in favor of the default FSP 2.0 VBT due to compatibility issues. Now that libgfxinit is available and the default, restore the board-specific VBTs so that external displays function properly. Select MAINBOARD_NO_FSP_GOP for all variants except glados since FSP/GOP init will not function properly with the older VBTs. Test: build/boot chell and caroline variants w/libgfxinit, verify external displays now work again. Change-Id: If55a67e0d3d78e4acf80cee1733ad8e14b8847d4 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/37397 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/google/glados/Kconfig | 5 ++--- src/mainboard/google/glados/variants/asuka/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/glados/variants/caroline/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/glados/variants/cave/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/glados/variants/chell/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/glados/variants/lars/data.vbt | Bin 0 -> 4608 bytes src/mainboard/google/glados/variants/sentry/data.vbt | Bin 0 -> 4608 bytes 7 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 src/mainboard/google/glados/variants/asuka/data.vbt create mode 100644 src/mainboard/google/glados/variants/caroline/data.vbt create mode 100644 src/mainboard/google/glados/variants/cave/data.vbt create mode 100644 src/mainboard/google/glados/variants/chell/data.vbt create mode 100644 src/mainboard/google/glados/variants/lars/data.vbt create mode 100644 src/mainboard/google/glados/variants/sentry/data.vbt (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 52907cc683..bc0c67ba46 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -20,6 +20,7 @@ config BOARD_GOOGLE_BASEBOARD_GLADOS select SOC_INTEL_SKYLAKE select SYSTEM_TYPE_LAPTOP select MAINBOARD_HAS_LIBGFXINIT + select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS if BOARD_GOOGLE_BASEBOARD_GLADOS @@ -63,9 +64,6 @@ config DEVICETREE string default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" -config INTEL_GMA_VBT_FILE - default "3rdparty/fsp/KabylakeFspBinPkg/SampleCode/Vbt/Vbt.bin" - config MAX_CPUS int default 8 @@ -94,4 +92,5 @@ config EC_GOOGLE_CHROMEEC_PD_BOARDNAME config UART_FOR_CONSOLE int default 2 + endif diff --git a/src/mainboard/google/glados/variants/asuka/data.vbt b/src/mainboard/google/glados/variants/asuka/data.vbt new file mode 100644 index 0000000000..8f2a7b0614 Binary files /dev/null and b/src/mainboard/google/glados/variants/asuka/data.vbt differ diff --git a/src/mainboard/google/glados/variants/caroline/data.vbt b/src/mainboard/google/glados/variants/caroline/data.vbt new file mode 100644 index 0000000000..02e1cd10f6 Binary files /dev/null and b/src/mainboard/google/glados/variants/caroline/data.vbt differ diff --git a/src/mainboard/google/glados/variants/cave/data.vbt b/src/mainboard/google/glados/variants/cave/data.vbt new file mode 100644 index 0000000000..02e1cd10f6 Binary files /dev/null and b/src/mainboard/google/glados/variants/cave/data.vbt differ diff --git a/src/mainboard/google/glados/variants/chell/data.vbt b/src/mainboard/google/glados/variants/chell/data.vbt new file mode 100644 index 0000000000..a654a5efd5 Binary files /dev/null and b/src/mainboard/google/glados/variants/chell/data.vbt differ diff --git a/src/mainboard/google/glados/variants/lars/data.vbt b/src/mainboard/google/glados/variants/lars/data.vbt new file mode 100644 index 0000000000..0aac82c3b1 Binary files /dev/null and b/src/mainboard/google/glados/variants/lars/data.vbt differ diff --git a/src/mainboard/google/glados/variants/sentry/data.vbt b/src/mainboard/google/glados/variants/sentry/data.vbt new file mode 100644 index 0000000000..0aac82c3b1 Binary files /dev/null and b/src/mainboard/google/glados/variants/sentry/data.vbt differ -- cgit v1.2.3