Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37397 )
Change subject: mb/google/glados: restore device-specific VBTs ......................................................................
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 --- M src/mainboard/google/glados/Kconfig A src/mainboard/google/glados/variants/asuka/data.vbt A src/mainboard/google/glados/variants/caroline/data.vbt A src/mainboard/google/glados/variants/cave/data.vbt A src/mainboard/google/glados/variants/chell/data.vbt A src/mainboard/google/glados/variants/lars/data.vbt A src/mainboard/google/glados/variants/sentry/data.vbt 7 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/37397/1
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 52907cc..bc0c67b 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -20,6 +20,7 @@ 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 @@ 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 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 0000000..8f2a7b0 --- /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 0000000..02e1cd1 --- /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 0000000..02e1cd1 --- /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 0000000..a654a5e --- /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 0000000..0aac82c --- /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 0000000..0aac82c --- /dev/null +++ b/src/mainboard/google/glados/variants/sentry/data.vbt Binary files differ
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37397 )
Change subject: mb/google/glados: restore device-specific VBTs ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37397 )
Change subject: mb/google/glados: restore device-specific VBTs ......................................................................
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 --- M src/mainboard/google/glados/Kconfig A src/mainboard/google/glados/variants/asuka/data.vbt A src/mainboard/google/glados/variants/caroline/data.vbt A src/mainboard/google/glados/variants/cave/data.vbt A src/mainboard/google/glados/variants/chell/data.vbt A src/mainboard/google/glados/variants/lars/data.vbt A src/mainboard/google/glados/variants/sentry/data.vbt 7 files changed, 2 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 52907cc..bc0c67b 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -20,6 +20,7 @@ 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 @@ 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 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 0000000..8f2a7b0 --- /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 0000000..02e1cd1 --- /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 0000000..02e1cd1 --- /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 0000000..a654a5e --- /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 0000000..0aac82c --- /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 0000000..0aac82c --- /dev/null +++ b/src/mainboard/google/glados/variants/sentry/data.vbt Binary files differ
-
Angel Pons (Code Review) -
Matt DeVillier (Code Review)
-
Patrick Georgi (Code Review)