summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@chromium.org>2019-12-06 19:11:08 -0700
committerPatrick Georgi <pgeorgi@google.com>2020-03-25 10:46:52 +0000
commit4cc2cacd333de4d77809f1212e879e61ff8e1616 (patch)
treecf4f3130af3102d63fb058f0fc5cc9d52cc1740e
parent17a478c85468049771da7d2c51831334942b4d43 (diff)
downloadcoreboot-4cc2cacd333de4d77809f1212e879e61ff8e1616.tar.xz
arch/x86: Add Kconfig option for 2nd VGA BIOS image
Picasso and Dali need different video bioses even though they use the same code in most other places. The Kconfig symbol names are changed from the downstream commit to make them more consistent with current coreboot code. BUG=b:145817712 TEST=Build Dali vBIOS into the coreboot image Change-Id: Ide0d061fda0abc78a74ddf97ba81fc3cf2b02e4f Signed-off-by: Martin Roth <martinroth@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/1956534 Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org> Reviewed-by: Raul E Rangel <rrangel@chromium.org> Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39791 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Raul Rangel <rrangel@chromium.org>
-rw-r--r--src/arch/x86/Makefile.inc5
-rw-r--r--src/device/Kconfig29
2 files changed, 34 insertions, 0 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 873161237e..b28ef78adc 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -34,6 +34,11 @@ cbfs-files-$(CONFIG_VGA_BIOS) += pci$(stripped_vgabios_id).rom
pci$(stripped_vgabios_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_FILE))
pci$(stripped_vgabios_id).rom-type := optionrom
+stripped_second_vbios_id = $(call strip_quotes,$(CONFIG_VGA_BIOS_SECOND_ID))
+cbfs-files-$(CONFIG_VGA_BIOS_SECOND) += pci$(stripped_second_vbios_id).rom
+pci$(stripped_second_vbios_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_SECOND_FILE))
+pci$(stripped_second_vbios_id).rom-type := optionrom
+
stripped_vgabios_dgpu_id = $(call strip_quotes,$(CONFIG_VGA_BIOS_DGPU_ID))
cbfs-files-$(CONFIG_VGA_BIOS_DGPU) += pci$(stripped_vgabios_dgpu_id).rom
pci$(stripped_vgabios_dgpu_id).rom-file := $(call strip_quotes,$(CONFIG_VGA_BIOS_DGPU_FILE))
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 25123ea3e0..66130ccd41 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -680,6 +680,35 @@ config VGA_BIOS_ID
Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+config VGA_BIOS_SECOND
+ bool "Add a 2nd video BIOS image"
+ depends on ARCH_X86 && VGA_BIOS
+ help
+ Select this option if you have a 2nd video BIOS image that you would
+ like to add to your ROM.
+
+config VGA_BIOS_SECOND_FILE
+ string "2nd video BIOS path and filename"
+ depends on VGA_BIOS_SECOND
+ default "vbios2.bin"
+ help
+ The path and filename of the file to use as video BIOS.
+
+config VGA_BIOS_SECOND_ID
+ string "Graphics device PCI IDs"
+ depends on VGA_BIOS_SECOND
+ help
+ The comma-separated PCI vendor and device ID that would associate
+ your vBIOS to your video card.
+
+ Example: 1106,3230
+
+ In the above example 1106 is the PCI vendor ID (in hex, but without
+ the "0x" prefix) and 3230 specifies the PCI device ID of the
+ video card (also in hex, without "0x" prefix).
+
+ Under GNU/Linux you can run `lspci -nn` to list the IDs of your PCI devices.
+
config VGA_BIOS_DGPU
bool "Add a discrete VGA BIOS image"
depends on VGA_BIOS