summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2019-11-29 13:05:11 -0600
committerPatrick Georgi <pgeorgi@google.com>2019-12-02 12:06:18 +0000
commit2d086e6971fc5bed9e5a6c028ca8601d2499fd82 (patch)
tree7daa7480f39c12c5a4f394097091decba5c5d313 /src/mainboard
parentd7e92e8958cac4858af547ba4646cb4d45960d57 (diff)
downloadcoreboot-2d086e6971fc5bed9e5a6c028ca8601d2499fd82.tar.xz
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 <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37397 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/glados/Kconfig5
-rw-r--r--src/mainboard/google/glados/variants/asuka/data.vbtbin0 -> 4608 bytes
-rw-r--r--src/mainboard/google/glados/variants/caroline/data.vbtbin0 -> 4608 bytes
-rw-r--r--src/mainboard/google/glados/variants/cave/data.vbtbin0 -> 4608 bytes
-rw-r--r--src/mainboard/google/glados/variants/chell/data.vbtbin0 -> 4608 bytes
-rw-r--r--src/mainboard/google/glados/variants/lars/data.vbtbin0 -> 4608 bytes
-rw-r--r--src/mainboard/google/glados/variants/sentry/data.vbtbin0 -> 4608 bytes
7 files changed, 2 insertions, 3 deletions
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
--- /dev/null
+++ b/src/mainboard/google/glados/variants/asuka/data.vbt
Binary files 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
--- /dev/null
+++ b/src/mainboard/google/glados/variants/caroline/data.vbt
Binary files 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
--- /dev/null
+++ b/src/mainboard/google/glados/variants/cave/data.vbt
Binary files 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
--- /dev/null
+++ b/src/mainboard/google/glados/variants/chell/data.vbt
Binary files 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
--- /dev/null
+++ b/src/mainboard/google/glados/variants/lars/data.vbt
Binary files 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
--- /dev/null
+++ b/src/mainboard/google/glados/variants/sentry/data.vbt
Binary files differ