Patrick Georgi merged this change.
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>
---
M src/mainboard/google/poppy/Kconfig
M src/mainboard/google/poppy/variants/nami/Makefile.inc
R src/mainboard/google/poppy/variants/nami/akali-data.vbt
A src/mainboard/google/poppy/variants/nami/data.vbt
A src/mainboard/google/poppy/variants/nami/pantheon-data.vbt
A src/mainboard/google/poppy/variants/nami/vayne-data.vbt
6 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index b7f479f..6bc8269 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -10,6 +10,7 @@
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 dc80357..0033c60 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-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
similarity index 100%
rename from src/mainboard/google/poppy/variants/nami/vbt-akali.bin
rename to src/mainboard/google/poppy/variants/nami/akali-data.vbt
Binary files 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 0000000..8406362
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/nami/data.vbt
Binary files 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 0000000..7e4fb0a
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/nami/pantheon-data.vbt
Binary files 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 0000000..7e4fb0a
--- /dev/null
+++ b/src/mainboard/google/poppy/variants/nami/vayne-data.vbt
Binary files differ
To view, visit change 30427. To unsubscribe, or for help writing mail filters, visit settings.