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/intel/baskingridge/Kconfig | 4 ---- src/mainboard/intel/dcp847ske/Kconfig | 4 ---- src/mainboard/intel/emeraldlake2/Kconfig | 4 ---- src/mainboard/intel/strago/Kconfig | 9 --------- src/mainboard/intel/wtm2/Kconfig | 4 ---- 5 files changed, 25 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig index 29f83f735a..6d7bc8cf93 100644 --- a/src/mainboard/intel/baskingridge/Kconfig +++ b/src/mainboard/intel/baskingridge/Kconfig @@ -25,8 +25,4 @@ config MAX_CPUS int default 16 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - endif # BOARD_INTEL_BASKING_RIDGE diff --git a/src/mainboard/intel/dcp847ske/Kconfig b/src/mainboard/intel/dcp847ske/Kconfig index 94d75d92ec..ebc172b6b0 100644 --- a/src/mainboard/intel/dcp847ske/Kconfig +++ b/src/mainboard/intel/dcp847ske/Kconfig @@ -31,10 +31,6 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER default "Intel NUC DCP847SKE" -config VGA_BIOS_FILE - string - default "pci8086,0106.rom" - config VGA_BIOS_ID string default "8086,0106" diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index f8a2e2e232..86fe98a803 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -27,8 +27,4 @@ config MAX_CPUS int default 16 -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - endif # BOARD_INTEL_EMERALDLAKE2 diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index c4a98426af..64d5dfc842 100644 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -28,15 +28,6 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER 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 string depends on VGA_BIOS diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index 44a0cd4097..cf16b8a7b8 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -20,8 +20,4 @@ config MAINBOARD_DIR config MAINBOARD_PART_NUMBER default "WHITETIP MOUNTAIN 2" -config VGA_BIOS_FILE - string - default "pci8086,0166.rom" - endif # BOARD_INTEL_WTM2 -- cgit v1.2.3