[coreboot-gerrit] Patch set updated for coreboot: device/Kconfig: Make VGA_BIOS_FILE generic if VGA_BIOS_ID is known.

Philipp Deppenwiese (zaolin.daisuki@googlemail.com) gerrit at coreboot.org
Fri Dec 16 02:17:36 CET 2016


Philipp Deppenwiese (zaolin.daisuki at googlemail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17895

-gerrit

commit f01a770a0228506f73d2da9e14059b48f2a712ed
Author: Philipp Deppenwiese <zaolin at das-labor.org>
Date:   Thu Dec 15 23:42:58 2016 +0100

    device/Kconfig: Make VGA_BIOS_FILE generic if VGA_BIOS_ID is known.
    
    Normally blobs are placed under the blobs repository of coreboot
    therefore the path should point to the mainboard blobs directory
    instead of the root of coreboot. This can be overwritten by a
    mainboard specific definition.
    
    Change-Id: I1791dcd4ddd037b4c95f3424bd629f7f1f3ab51a
    Signed-off-by: Philipp Deppenwiese <zaolin at das-labor.org>
---
 src/device/Kconfig                           | 3 ++-
 src/mainboard/amd/inagua/Kconfig             | 5 -----
 src/mainboard/amd/persimmon/Kconfig          | 5 -----
 src/mainboard/amd/south_station/Kconfig      | 3 ---
 src/mainboard/amd/torpedo/Kconfig            | 5 -----
 src/mainboard/amd/union_station/Kconfig      | 3 ---
 src/mainboard/apple/macbookair4_2/Kconfig    | 4 ----
 src/mainboard/asus/f2a85-m_le/Kconfig        | 4 ----
 src/mainboard/getac/p470/Kconfig             | 4 ++--
 src/mainboard/gigabyte/ga-b75m-d3h/Kconfig   | 4 ----
 src/mainboard/gigabyte/ga-b75m-d3v/Kconfig   | 4 ----
 src/mainboard/google/auron/Kconfig           | 4 ++--
 src/mainboard/google/auron_paine/Kconfig     | 4 ++--
 src/mainboard/google/beltino/Kconfig         | 4 ++--
 src/mainboard/google/butterfly/Kconfig       | 4 ++--
 src/mainboard/google/enguarde/Kconfig        | 4 ++--
 src/mainboard/google/guado/Kconfig           | 4 ++--
 src/mainboard/google/jecht/Kconfig           | 4 ++--
 src/mainboard/google/link/Kconfig            | 4 ++--
 src/mainboard/google/ninja/Kconfig           | 4 ++--
 src/mainboard/google/parrot/Kconfig          | 4 ++--
 src/mainboard/google/rambi/Kconfig           | 4 ++--
 src/mainboard/google/rikku/Kconfig           | 4 ++--
 src/mainboard/google/samus/Kconfig           | 4 ++--
 src/mainboard/google/slippy/Kconfig          | 4 ++--
 src/mainboard/google/stout/Kconfig           | 4 ----
 src/mainboard/google/tidus/Kconfig           | 4 ++--
 src/mainboard/intel/baskingridge/Kconfig     | 4 ++--
 src/mainboard/intel/cougar_canyon2/Kconfig   | 4 ----
 src/mainboard/intel/emeraldlake2/Kconfig     | 4 ++--
 src/mainboard/intel/wtm2/Kconfig             | 4 ++--
 src/mainboard/jetway/nf81-t56n-lf/Kconfig    | 5 -----
 src/mainboard/kontron/ktqm77/Kconfig         | 4 ++--
 src/mainboard/lenovo/t420/Kconfig            | 4 ----
 src/mainboard/lenovo/t420s/Kconfig           | 4 ----
 src/mainboard/lenovo/t430s/Kconfig           | 4 ++--
 src/mainboard/lenovo/t520/Kconfig            | 4 ----
 src/mainboard/lenovo/t530/Kconfig            | 4 ----
 src/mainboard/lenovo/x220/Kconfig            | 5 -----
 src/mainboard/lenovo/x230/Kconfig            | 4 ----
 src/mainboard/lippert/frontrunner-af/Kconfig | 5 -----
 src/mainboard/lippert/toucan-af/Kconfig      | 5 -----
 src/mainboard/pcengines/apu1/Kconfig         | 5 -----
 src/mainboard/samsung/lumpy/Kconfig          | 4 ++--
 src/mainboard/samsung/stumpy/Kconfig         | 4 ++--
 src/mainboard/via/pc2500e/Kconfig            | 4 ----
 src/mainboard/winent/mb6047/Kconfig          | 4 ----
 src/soc/intel/fsp_baytrail/Kconfig           | 4 ----
 48 files changed, 48 insertions(+), 149 deletions(-)

diff --git a/src/device/Kconfig b/src/device/Kconfig
index d238547..b5a4ee7 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -339,7 +339,8 @@ config VGA_BIOS
 config VGA_BIOS_FILE
 	string "VGA BIOS path and filename"
 	depends on VGA_BIOS
-	default "vgabios.bin"
+	default "3rdparty/blobs/mainboard/$(MAINBOARDDIR)/pci${VGA_BIOS_ID}.rom" if USE_BLOBS
+	default "site-local/pci${VGA_BIOS_ID}.rom"
 	help
 	  The path and filename of the file to use as VGA BIOS.
 
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 89bb516..b68bcba 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -61,11 +61,6 @@ config VGA_BIOS
 	bool
 	default n
 
-#config VGA_BIOS_FILE
-#        string "VGA BIOS path and filename"
-#        depends on VGA_BIOS
-#        default "rom/video/OntarioGenericVBios.bin"
-
 config VGA_BIOS_ID
 	string "VGA device PCI IDs"
 	depends on VGA_BIOS
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index b365eba..0e28ad0 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -61,11 +61,6 @@ config VGA_BIOS
 	bool
 	default n
 
-#config VGA_BIOS_FILE
-#	string "VGA BIOS path and filename"
-#	depends on VGA_BIOS
-#	default "rom/video/OntarioGenericVbios.bin"
-
 config VGA_BIOS_ID
 	string
 	default "1002,9802"
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index f92d27d..dc192be 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -60,9 +60,6 @@ config ONBOARD_VGA_IS_PRIMARY
 config VGA_BIOS
 	bool
 	default n
-config VGA_BIOS_FILE
-	string
-	default "site-local/vgabios.bin"
 
 config VGA_BIOS_ID
 	string
diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig
index 5c85c4b..2c80932 100644
--- a/src/mainboard/amd/torpedo/Kconfig
+++ b/src/mainboard/amd/torpedo/Kconfig
@@ -69,11 +69,6 @@ config VGA_BIOS
 	bool
 	default n
 
-#config VGA_BIOS_FILE
-#	string "VGA BIOS path and filename"
-#	depends on VGA_BIOS
-#	default "rom/video/LlanoGenericVbios.bin"
-
 config VGA_BIOS_ID
 	string "VGA device PCI IDs"
 	depends on VGA_BIOS
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 83660bb..81a3e5c 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -59,9 +59,6 @@ config ONBOARD_VGA_IS_PRIMARY
 config VGA_BIOS
 	bool
 	default n
-config VGA_BIOS_FILE
-	string
-	default "site-local/vgabios.bin"
 
 config VGA_BIOS_ID
 	string
diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig
index 08e7166..42ece41 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -31,10 +31,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "MacBookAir4,2"
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0116.rom"
-
 config VGA_BIOS_ID
 	string
 	default "8086,0116"
diff --git a/src/mainboard/asus/f2a85-m_le/Kconfig b/src/mainboard/asus/f2a85-m_le/Kconfig
index a81f700..923bee1 100644
--- a/src/mainboard/asus/f2a85-m_le/Kconfig
+++ b/src/mainboard/asus/f2a85-m_le/Kconfig
@@ -86,8 +86,4 @@ config VGA_BIOS_ID
 	string
 	default "1002,9901"
 
-config VGA_BIOS_FILE
-	string
-	default "pci1002,9901.rom"
-
 endif # BOARD_ASUS_F2A85_M_LE
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index ea68bed..985dd3a 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -60,8 +60,8 @@ config MAX_CPUS
 	int
 	default 4
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "getac-pci8086,27a2.rom"
+	default "8086,27a2"
 
 endif # BOARD_GETAC_P470
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index e53b68c..81190f9 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -46,10 +46,6 @@ config VGA_BIOS_ID
 	string
 	default "8086,0162"
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0162.rom"
-
 config HAVE_IFD_BIN
 	bool
 	default n
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
index 2be3322..a4db486 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/Kconfig
@@ -46,10 +46,6 @@ config VGA_BIOS_ID
 	string
 	default "8086,0102"
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0102.rom"
-
 config HAVE_IFD_BIN
 	bool
 	default n
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 9eda101..4b30afa 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -37,9 +37,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/auron_paine/Kconfig b/src/mainboard/google/auron_paine/Kconfig
index 147f37d..7c63ee3 100644
--- a/src/mainboard/google/auron_paine/Kconfig
+++ b/src/mainboard/google/auron_paine/Kconfig
@@ -45,9 +45,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig
index c430018..ca663a7 100644
--- a/src/mainboard/google/beltino/Kconfig
+++ b/src/mainboard/google/beltino/Kconfig
@@ -61,9 +61,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0406.rom"
+	default "8086,0406"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 09d2157..fdf2f17 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -36,9 +36,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0106.rom"
+	default "8086,0106"
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
diff --git a/src/mainboard/google/enguarde/Kconfig b/src/mainboard/google/enguarde/Kconfig
index c2842bb..c990748 100644
--- a/src/mainboard/google/enguarde/Kconfig
+++ b/src/mainboard/google/enguarde/Kconfig
@@ -27,9 +27,9 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Enguarde"
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0f31.rom"
+	default "8086,0f31"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/guado/Kconfig b/src/mainboard/google/guado/Kconfig
index ce6ee07..2858363 100644
--- a/src/mainboard/google/guado/Kconfig
+++ b/src/mainboard/google/guado/Kconfig
@@ -34,9 +34,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 8a30a4d..7676dab 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -31,9 +31,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index b521f9c..3a6e356 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -37,9 +37,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config GBB_HWID
 	string
diff --git a/src/mainboard/google/ninja/Kconfig b/src/mainboard/google/ninja/Kconfig
index 4c28e1a..dc513b7 100644
--- a/src/mainboard/google/ninja/Kconfig
+++ b/src/mainboard/google/ninja/Kconfig
@@ -29,9 +29,9 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Ninja"
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0f31.rom"
+	default "8086,0f31"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 7b6b49b..a9d217e 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -36,9 +36,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0106.rom"
+	default "8086,0106"
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 94354c9..d7cfccc 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -27,9 +27,9 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Rambi"
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/rikku/Kconfig b/src/mainboard/google/rikku/Kconfig
index 8dc1551..87a5c7c 100644
--- a/src/mainboard/google/rikku/Kconfig
+++ b/src/mainboard/google/rikku/Kconfig
@@ -42,9 +42,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig
index 528a5eb..82e06f4 100644
--- a/src/mainboard/google/samus/Kconfig
+++ b/src/mainboard/google/samus/Kconfig
@@ -37,9 +37,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index 045d6a8..48d49b8 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -73,9 +73,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0406.rom"
+	default "8086,0406"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index 571cbce..2ba6a6e 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -36,10 +36,6 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0156.rom"
-
 config VGA_BIOS_ID
 	string
 	default "8086,0156"
diff --git a/src/mainboard/google/tidus/Kconfig b/src/mainboard/google/tidus/Kconfig
index 8d9b4860..4c37feb 100644
--- a/src/mainboard/google/tidus/Kconfig
+++ b/src/mainboard/google/tidus/Kconfig
@@ -34,9 +34,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index df5d312..73dba02 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -33,9 +33,9 @@ config MAX_CPUS
 	int
 	default 16
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/intel/cougar_canyon2/Kconfig b/src/mainboard/intel/cougar_canyon2/Kconfig
index 00db10e..ce9eda8 100644
--- a/src/mainboard/intel/cougar_canyon2/Kconfig
+++ b/src/mainboard/intel/cougar_canyon2/Kconfig
@@ -47,10 +47,6 @@ config VGA_BIOS
 	bool
 	default y
 
-config VGA_BIOS_FILE
-	string
-	default "../intel/mainboard/intel/cougar_canyon2/vbios/snm_2170.dat"
-
 config VGA_BIOS_ID
 	string
 	default "8086,0166"
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 9ee41e8..e600526 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -32,8 +32,8 @@ config MAX_CPUS
 	int
 	default 16
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 endif # BOARD_INTEL_EMERALDLAKE2
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index f57cb23..2a26e6c 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -30,9 +30,9 @@ config MAX_CPUS
 	int
 	default 16
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config HAVE_IFD_BIN
 	bool
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
index 14c534b..81d6f32 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -62,11 +62,6 @@ config VGA_BIOS
 	bool
 	default n
 
-#config VGA_BIOS_FILE
-#	string "VGA BIOS path and filename"
-#	depends on VGA_BIOS
-#	default "rom/video/OntarioGenericVbios.bin"
-
 config VGA_BIOS_ID
 	string
 	default "1002,9806" # FUSION_G_T56N
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index 115a0fa..8bde3e0 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -32,9 +32,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index e2272b1..78906f4 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -56,10 +56,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 10
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0126.rom"
-
 config VGA_BIOS_ID
 	string
 	default "8086,0126"
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index d278ccb..e0f877e 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -55,10 +55,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 10
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0126.rom"
-
 config VGA_BIOS_ID
 	string
 	default "8086,0126"
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index bb898cf..ca89026 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -55,9 +55,9 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 10
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0166.rom"
+	default "8086,0166"
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 4ce27f1..0d99536 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -59,10 +59,6 @@ config VGA_BIOS_ID
 	string
 	default "8086,0126"
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0126.rom"
-
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x17aa
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 76147fc..e4484cc 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -62,10 +62,6 @@ config VGA_BIOS_ID
 	string
 	default "8086,0106"
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0106.rom"
-
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
 	hex
 	default 0x17aa
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index 5367fd1..4e39b90 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -55,11 +55,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 10
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0116.rom" if BOARD_LENOVO_X220I
-	default "pci8086,0126.rom"
-
 config VGA_BIOS_ID
 	string
 	default "8086,0116" if BOARD_LENOVO_X220I
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index 16e34ff..0e5509b 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -55,10 +55,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 10
 
-config VGA_BIOS_FILE
-	string
-	default "pci8086,0166.rom"
-
 config VGA_BIOS_ID
 	string
 	default "8086,0166"
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index 1ec219e..4385cee 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -63,11 +63,6 @@ config VGA_BIOS
 	bool
 	default n
 
-#config VGA_BIOS_FILE
-#	string "VGA BIOS path and filename"
-#	depends on VGA_BIOS
-#	default "rom/video/OntarioGenericVbios.bin"
-
 config VGA_BIOS_ID
 	string
 	default "1002,9802"
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 590909b..206fe98 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -65,11 +65,6 @@ config VGA_BIOS
 	bool
 	default n
 
-#config VGA_BIOS_FILE
-#	string "VGA BIOS path and filename"
-#	depends on VGA_BIOS
-#	default "rom/video/OntarioGenericVbios.bin"
-
 config VGA_BIOS_ID
 	string
 	default "1002,9802"
diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig
index 3099d14..ff3254b 100644
--- a/src/mainboard/pcengines/apu1/Kconfig
+++ b/src/mainboard/pcengines/apu1/Kconfig
@@ -63,11 +63,6 @@ config VGA_BIOS
 	bool
 	default n
 
-#config VGA_BIOS_FILE
-#	string "VGA BIOS path and filename"
-#	depends on VGA_BIOS
-#	default "rom/video/OntarioGenericVbios.bin"
-
 config VGA_BIOS_ID
 	string
 	default "1002,9802"
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 7cb00e5..c65fc2d 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -39,9 +39,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0106.rom"
+	default "8086,0106"
 
 config MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 	bool
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 3777f69..e83b00b 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -37,9 +37,9 @@ config MAX_CPUS
 	int
 	default 8
 
-config VGA_BIOS_FILE
+config VGA_BIOS_ID
 	string
-	default "pci8086,0106.rom"
+	default "8086,0106"
 
 config MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 	bool
diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index d5e1133..62f9788 100644
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -24,10 +24,6 @@ config IRQ_SLOT_COUNT
 	int
 	default 10
 
-config VGA_BIOS_FILE
-	string
-	default "M14CRT.ROM"
-
 config VGA_BIOS_ID
 	string
 	default "1106,3344"
diff --git a/src/mainboard/winent/mb6047/Kconfig b/src/mainboard/winent/mb6047/Kconfig
index 5a3b81d..ca22025 100644
--- a/src/mainboard/winent/mb6047/Kconfig
+++ b/src/mainboard/winent/mb6047/Kconfig
@@ -58,8 +58,4 @@ config VGA_BIOS_ID
 	string
 	default "126f,0720"
 
-config VGA_BIOS_FILE
-	string
-	default "DM22383.ROM"
-
 endif # BOARD_WINENT_MB6047
diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig
index 689e625..9655d74 100644
--- a/src/soc/intel/fsp_baytrail/Kconfig
+++ b/src/soc/intel/fsp_baytrail/Kconfig
@@ -91,10 +91,6 @@ config ENABLE_BUILTIN_COM1
 	  configure the pads and enable it. This serial port can be used for
 	  the debug console.
 
-config VGA_BIOS_FILE
-	string
-	default "../intel/cpu/baytrail/vbios/Vga.dat" if VGA_BIOS
-
 config FSP_BAYTRAIL_GFX_INIT
 	default n
 	bool



More information about the coreboot-gerrit mailing list