From 05ae8f2ff31ba1d02aba15c99025df91588712e1 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 8 Mar 2021 10:35:49 +0100 Subject: mainboard: Drop invalid `VGA_BIOS_FILE` defaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51340 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Michael Niewöhner Reviewed-by: Felix Singer --- src/mainboard/lenovo/l520/Kconfig | 4 ---- src/mainboard/lenovo/s230u/Kconfig | 4 ---- src/mainboard/lenovo/t420/Kconfig | 4 ---- src/mainboard/lenovo/t420s/Kconfig | 4 ---- src/mainboard/lenovo/t430s/Kconfig | 4 ---- src/mainboard/lenovo/t440p/Kconfig | 4 ---- src/mainboard/lenovo/t520/Kconfig | 4 ---- src/mainboard/lenovo/t530/Kconfig | 4 ---- src/mainboard/lenovo/x1_carbon_gen1/Kconfig | 4 ---- src/mainboard/lenovo/x220/Kconfig | 7 +------ src/mainboard/lenovo/x230/Kconfig | 4 ---- 11 files changed, 1 insertion(+), 46 deletions(-) (limited to 'src/mainboard/lenovo') diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig index d212dadf3c92..971dd84b14da 100644 --- a/src/mainboard/lenovo/l520/Kconfig +++ b/src/mainboard/lenovo/l520/Kconfig @@ -24,10 +24,6 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER default "ThinkPad L520" -config VGA_BIOS_FILE - string - default "pci8086,0126.rom" - config VGA_BIOS_ID string default "8086,0126" diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig index c77950432334..08f82aa37cb7 100644 --- a/src/mainboard/lenovo/s230u/Kconfig +++ b/src/mainboard/lenovo/s230u/Kconfig @@ -38,10 +38,6 @@ config DRAM_RESET_GATE_GPIO int default 60 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - config VGA_BIOS_ID string default "8086,0166" diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index d1cd0ec117f1..6f4988c03b77 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -60,10 +60,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 db6e2711e0a4..c46d4fc43cf4 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -59,10 +59,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 710dda2f7134..dce078e91a20 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -69,10 +69,6 @@ config DRAM_RESET_GATE_GPIO int default 10 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - config ONBOARD_VGA_IS_PRIMARY bool default y diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/t440p/Kconfig index 991c1bd0d978..a26b9b7964f1 100644 --- a/src/mainboard/lenovo/t440p/Kconfig +++ b/src/mainboard/lenovo/t440p/Kconfig @@ -47,10 +47,6 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER default "ThinkPad T440p" -config VGA_BIOS_FILE - string - default "pci8086,0416.rom" - config VGA_BIOS_ID string default "8086,0416" diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 5e120566ff34..039baa69e1af 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -71,10 +71,6 @@ config VGA_BIOS_ID string default "8086,0126" -config VGA_BIOS_FILE - string - default "pci8086,0126.rom" - config PS2K_EISAID default "PNP0303" diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index c2d649c3a061..87be416622dc 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -68,10 +68,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/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index d360c56bd8bd..ec5092fd399c 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -59,10 +59,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/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 8530e49dc5dc..61b3c1489edd 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -67,15 +67,10 @@ config DRAM_RESET_GATE_GPIO int 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 string default "8086,0116" if BOARD_LENOVO_X220I + # FIXME: x1 with i3 cpu may also use "8086,0116" default "8086,0126" config PS2K_EISAID diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 61144b89c696..cafdead858ff 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -70,10 +70,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" -- cgit v1.2.3