GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mainboard: Drop invalid `VGA_BIOS_FILE` defaults 

If the VGA BIOS file path for `VGA_BIOS_FILE` in a mainboard's Kconfig
does not exist in the coreboot tree (including submodules), drop it.
These files should be stored in the `site-local` subdirectory and the
paths specified for each board in `site-local/Kconfig`. For example:

config VGA_BIOS_FILE
	default "site-local/x200_vbios.bin" if BOARD_LENOVO_X200

Note that this is just an example. There are better ways to structure
one's `site-local` subfolder. Using the `CONFIG_MAINBOARD_DIR` option
would be one of them, though variants may still need special handling.

Also, update autoport to not generate `VGA_BIOS_FILE` defaults.

Change-Id: I1b5dfba035a42d7943f270f95fb7d32b285584d2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51340
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by:  Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Angel Pons 2021-03-08 10:35:49 +01:00 committed by Felix Singer
parent dcc0cc27f4
commit 05ae8f2ff3
44 changed files with 1 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/amd/inagua/Kconfig
View File

@ -36,11 +36,6 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
#config VGA_BIOS_FILE
# string "VGA BIOS path and filename"
# depends on VGA_BIOS
# default "rom/video/OntarioGenericVBios.bin"
config VGA_BIOS_ID config VGA_BIOS_ID
string "VGA device PCI IDs" string "VGA device PCI IDs"
depends on VGA_BIOS depends on VGA_BIOS

5
src/mainboard/amd/persimmon/Kconfig
View File

@ -37,11 +37,6 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
#config VGA_BIOS_FILE
# string "VGA BIOS path and filename"
# depends on VGA_BIOS
# default "rom/video/OntarioGenericVbios.bin"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "1002,9802" default "1002,9802"

4
src/mainboard/amd/south_station/Kconfig
View File

@ -36,10 +36,6 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
config VGA_BIOS_FILE
string
default "site-local/vgabios.bin"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "1002,9806" default "1002,9806"

4
src/mainboard/amd/union_station/Kconfig
View File

@ -35,10 +35,6 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
config VGA_BIOS_FILE
string
default "site-local/vgabios.bin"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "1002,9802" default "1002,9802"

4
src/mainboard/apple/macbookair4_2/Kconfig
View File

@ -22,10 +22,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "MacBookAir4,2" default "MacBookAir4,2"
config VGA_BIOS_FILE
string
default "pci8086,0116.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0116" default "8086,0116"

4
src/mainboard/asus/f2a85-m/Kconfig
View File

@ -95,10 +95,6 @@ config VGA_BIOS_ID
string string
default "1002,9901" default "1002,9901"
config VGA_BIOS_FILE
string
default "pci1002,9901.rom"
endif endif
config DEVICETREE config DEVICETREE

4
src/mainboard/getac/p470/Kconfig
View File

@ -32,8 +32,4 @@ config IRQ_SLOT_COUNT
int int
default 18 default 18
config VGA_BIOS_FILE
string
default "getac-pci8086,27a2.rom"
endif # BOARD_GETAC_P470 endif # BOARD_GETAC_P470

4
src/mainboard/google/auron/Kconfig
View File

@ -51,10 +51,6 @@ config EC_GOOGLE_CHROMEEC_BOARDNAME
default "samus" if BOARD_GOOGLE_SAMUS default "samus" if BOARD_GOOGLE_SAMUS
default "" default ""
config VGA_BIOS_FILE
string
default "pci8086,0406.rom"
config MAINBOARD_SMBIOS_MANUFACTURER config MAINBOARD_SMBIOS_MANUFACTURER
string string
default "GOOGLE" default "GOOGLE"

4
src/mainboard/google/beltino/Kconfig
View File

@ -40,10 +40,6 @@ config MAINBOARD_FAMILY
string string
default "Google_Beltino" default "Google_Beltino"
config VGA_BIOS_FILE
string
default "pci8086,0406.rom"
# Override the default variant behavior, since the data.vbt is the same # Override the default variant behavior, since the data.vbt is the same
# for all variants except monroe # for all variants except monroe
config INTEL_GMA_VBT_FILE config INTEL_GMA_VBT_FILE

4
src/mainboard/google/butterfly/Kconfig
View File

@ -31,10 +31,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Butterfly" default "Butterfly"
config VGA_BIOS_FILE
string
default "pci8086,0106.rom"
config MAINBOARD_VENDOR config MAINBOARD_VENDOR
string string
default "Hewlett-Packard" default "Hewlett-Packard"

4
src/mainboard/google/jecht/Kconfig
View File

@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER
default "Rikku" if BOARD_GOOGLE_RIKKU default "Rikku" if BOARD_GOOGLE_RIKKU
default "Tidus" if BOARD_GOOGLE_TIDUS default "Tidus" if BOARD_GOOGLE_TIDUS
config VGA_BIOS_FILE
string
default "pci8086,0406.rom"
# Override the default variant behavior, since the data.vbt is the same # Override the default variant behavior, since the data.vbt is the same
# for all variants except tidus # for all variants except tidus
config INTEL_GMA_VBT_FILE config INTEL_GMA_VBT_FILE

4
src/mainboard/google/link/Kconfig
View File

@ -31,10 +31,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Link" default "Link"
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
config MAINBOARD_SMBIOS_MANUFACTURER config MAINBOARD_SMBIOS_MANUFACTURER
string string
default "GOOGLE" default "GOOGLE"

4
src/mainboard/google/parrot/Kconfig
View File

@ -32,10 +32,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Parrot" default "Parrot"
config VGA_BIOS_FILE
string
default "pci8086,0106.rom"
config MAINBOARD_SMBIOS_MANUFACTURER config MAINBOARD_SMBIOS_MANUFACTURER
string string
default "GOOGLE" default "GOOGLE"

4
src/mainboard/google/slippy/Kconfig
View File

@ -48,10 +48,6 @@ config MAINBOARD_FAMILY
config OVERRIDE_DEVICETREE config OVERRIDE_DEVICETREE
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config VGA_BIOS_FILE
string
default "pci8086,0406.rom"
# Override the default variant behavior, since the data.vbt is the same # Override the default variant behavior, since the data.vbt is the same
# for all variants. # for all variants.
config INTEL_GMA_VBT_FILE config INTEL_GMA_VBT_FILE

4
src/mainboard/google/stout/Kconfig
View File

@ -30,10 +30,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Stout" default "Stout"
config VGA_BIOS_FILE
string
default "pci8086,0156.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0156" default "8086,0156"

4
src/mainboard/hp/folio_9480m/Kconfig
View File

@ -25,10 +25,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "HP EliteBook Folio 9480m" default "HP EliteBook Folio 9480m"
config VGA_BIOS_FILE
string
default "pci8086,0a16.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0a16" default "8086,0a16"

5
src/mainboard/hp/snb_ivb_laptops/Kconfig
View File

@ -44,11 +44,6 @@ config MAINBOARD_PART_NUMBER
config OVERRIDE_DEVICETREE config OVERRIDE_DEVICETREE
default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb" default "variants/\$(CONFIG_VARIANT_DIR)/overridetree.cb"
config VGA_BIOS_FILE
string
default "pci8086,0116.rom" if SOUTHBRIDGE_INTEL_BD82X6X
default "pci8086,0166.rom" if SOUTHBRIDGE_INTEL_C216
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0116" if SOUTHBRIDGE_INTEL_BD82X6X default "8086,0116" if SOUTHBRIDGE_INTEL_BD82X6X

4
src/mainboard/ibase/mb899/Kconfig
View File

@ -26,8 +26,4 @@ config IRQ_SLOT_COUNT
int int
default 18 default 18
config VGA_BIOS_FILE
string
default "amipci_01.20"
endif # BOARD_IBASE_MB899 endif # BOARD_IBASE_MB899

4
src/mainboard/intel/baskingridge/Kconfig
View File

@ -25,8 +25,4 @@ config MAX_CPUS
int int
default 16 default 16
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
endif # BOARD_INTEL_BASKING_RIDGE endif # BOARD_INTEL_BASKING_RIDGE

4
src/mainboard/intel/dcp847ske/Kconfig
View File

@ -31,10 +31,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Intel NUC DCP847SKE" default "Intel NUC DCP847SKE"
config VGA_BIOS_FILE
string
default "pci8086,0106.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0106" default "8086,0106"

4
src/mainboard/intel/emeraldlake2/Kconfig
View File

@ -27,8 +27,4 @@ config MAX_CPUS
int int
default 16 default 16
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
endif # BOARD_INTEL_EMERALDLAKE2 endif # BOARD_INTEL_EMERALDLAKE2

9
src/mainboard/intel/strago/Kconfig
View File

@ -28,15 +28,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Strago" default "Strago"
config VGA_BIOS_FILE
string
depends on VGA_BIOS
default "3rdparty/blobs/mainboard/intel/strago/vgabios.bin"
help
The C0 version of the video BIOS gets computed from this name
so that they can both be added. Only the correct one for the
system will be run.
config VGA_BIOS_ID config VGA_BIOS_ID
string string
depends on VGA_BIOS depends on VGA_BIOS

4
src/mainboard/intel/wtm2/Kconfig
View File

@ -20,8 +20,4 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "WHITETIP MOUNTAIN 2" default "WHITETIP MOUNTAIN 2"
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
endif # BOARD_INTEL_WTM2 endif # BOARD_INTEL_WTM2

5
src/mainboard/jetway/nf81-t56n-lf/Kconfig
View File

@ -37,11 +37,6 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
#config VGA_BIOS_FILE
# string "VGA BIOS path and filename"
# depends on VGA_BIOS
# default "rom/video/OntarioGenericVbios.bin"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "1002,9806" # FUSION_G_T56N default "1002,9806" # FUSION_G_T56N

4
src/mainboard/kontron/986lcd-m/Kconfig
View File

@ -28,8 +28,4 @@ config IRQ_SLOT_COUNT
int int
default 18 default 18
config VGA_BIOS_FILE
string
default "amipci_01.20"
endif # BOARD_KONTRON_986LCD_M endif # BOARD_KONTRON_986LCD_M

4
src/mainboard/kontron/ktqm77/Kconfig
View File

@ -21,8 +21,4 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "KTQM77/mITX" default "KTQM77/mITX"
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
endif # BOARD_KONTRON_KTQM77 endif # BOARD_KONTRON_KTQM77

4
src/mainboard/lenovo/l520/Kconfig
View File

@ -24,10 +24,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "ThinkPad L520" default "ThinkPad L520"
config VGA_BIOS_FILE
string
default "pci8086,0126.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0126" default "8086,0126"

4
src/mainboard/lenovo/s230u/Kconfig
View File

@ -38,10 +38,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 60 default 60
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0166" default "8086,0166"

4
src/mainboard/lenovo/t420/Kconfig
View File

@ -60,10 +60,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config VGA_BIOS_FILE
string
default "pci8086,0126.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0126" default "8086,0126"

4
src/mainboard/lenovo/t420s/Kconfig
View File

@ -59,10 +59,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config VGA_BIOS_FILE
string
default "pci8086,0126.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0126" default "8086,0126"

4
src/mainboard/lenovo/t430s/Kconfig
View File

@ -69,10 +69,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
config ONBOARD_VGA_IS_PRIMARY config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y

4
src/mainboard/lenovo/t440p/Kconfig
View File

@ -47,10 +47,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "ThinkPad T440p" default "ThinkPad T440p"
config VGA_BIOS_FILE
string
default "pci8086,0416.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0416" default "8086,0416"

4
src/mainboard/lenovo/t520/Kconfig
View File

@ -71,10 +71,6 @@ config VGA_BIOS_ID
string string
default "8086,0126" default "8086,0126"
config VGA_BIOS_FILE
string
default "pci8086,0126.rom"
config PS2K_EISAID config PS2K_EISAID
default "PNP0303" default "PNP0303"

4
src/mainboard/lenovo/t530/Kconfig
View File

@ -68,10 +68,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0166" default "8086,0166"

4
src/mainboard/lenovo/x1_carbon_gen1/Kconfig
View File

@ -59,10 +59,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0166" default "8086,0166"

7
src/mainboard/lenovo/x220/Kconfig
View File

@ -67,15 +67,10 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config VGA_BIOS_FILE
string
default "pci8086,0116.rom" if BOARD_LENOVO_X220I
# FIXME: x1 with i3 cpu may also use "pci8086,0116.rom"
default "pci8086,0126.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0116" if BOARD_LENOVO_X220I default "8086,0116" if BOARD_LENOVO_X220I
# FIXME: x1 with i3 cpu may also use "8086,0116"
default "8086,0126" default "8086,0126"
config PS2K_EISAID config PS2K_EISAID

4
src/mainboard/lenovo/x230/Kconfig
View File

@ -70,10 +70,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config VGA_BIOS_FILE
string
default "pci8086,0166.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,0166" default "8086,0166"

5
src/mainboard/pcengines/apu1/Kconfig
View File

@ -40,11 +40,6 @@ config ONBOARD_VGA_IS_PRIMARY
bool bool
default y default y
#config VGA_BIOS_FILE
# string "VGA BIOS path and filename"
# depends on VGA_BIOS
# default "rom/video/OntarioGenericVbios.bin"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "1002,9802" default "1002,9802"

7
src/mainboard/protectli/vault_bsw/Kconfig
View File

@ -51,13 +51,6 @@ config PXE_ROM_ID
default "8086,157b" if BOARD_PROTECTLI_FW4B default "8086,157b" if BOARD_PROTECTLI_FW4B
if !RUN_FSP_GOP if !RUN_FSP_GOP
config VGA_BIOS_FILE
string
default "3rdparty/blobs/mainboard/protectli/vault_bsw/vgabios.bin"
help
The C0 version of the video bios gets computed from this name
so that they can both be added. Only the correct one for the
system will be run.
config VGA_BIOS_ID config VGA_BIOS_ID
string string

4
src/mainboard/samsung/lumpy/Kconfig
View File

@ -35,10 +35,6 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Lumpy" default "Lumpy"
config VGA_BIOS_FILE
string
default "pci8086,0106.rom"
if EARLY_PCI_BRIDGE if EARLY_PCI_BRIDGE
config EARLY_PCI_BRIDGE_DEVICE config EARLY_PCI_BRIDGE_DEVICE

4
src/mainboard/samsung/stumpy/Kconfig
View File

@ -30,8 +30,4 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
default "Stumpy" default "Stumpy"
config VGA_BIOS_FILE
string
default "pci8086,0106.rom"
endif # BOARD_SAMSUNG_STUMPY endif # BOARD_SAMSUNG_STUMPY

4
src/mainboard/supermicro/x9scl/Kconfig
View File

@ -25,10 +25,6 @@ config USBDEBUG_HCD_INDEX
int int
default 1 default 1
config VGA_BIOS_FILE
string
default "pci102b,0532.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
depends on VGA_BIOS depends on VGA_BIOS

4
src/mainboard/system76/lemp9/Kconfig
View File

@ -55,10 +55,6 @@ config MAX_CPUS
config DIMM_MAX config DIMM_MAX
default 2 default 2
config VGA_BIOS_FILE
string
default "pci8086,9b41.rom"
config VGA_BIOS_ID config VGA_BIOS_ID
string string
default "8086,9b41" default "8086,9b41"

3
util/autoport/main.go
View File

@ -510,9 +510,6 @@ func (g GenericVGA) Scan(ctx Context, addr PCIDevData) {
KconfigString["VGA_BIOS_ID"] = fmt.Sprintf("%04x,%04x", KconfigString["VGA_BIOS_ID"] = fmt.Sprintf("%04x,%04x",
addr.PCIVenID, addr.PCIVenID,
addr.PCIDevID) addr.PCIDevID)
KconfigString["VGA_BIOS_FILE"] = fmt.Sprintf("pci%04x,%04x.rom",
addr.PCIVenID,
addr.PCIDevID)
PutPCIDevParent(addr, g.Comment, g.MissingParent) PutPCIDevParent(addr, g.Comment, g.MissingParent)
IGDEnabled = true IGDEnabled = true
} }