Allow per-northbridge and per-board VGA BIOS file name and PCI ID defaults.

Of course, the user can still override those defaults, if needed.

Add defaults for VIA pc2500e, Kontron 986LCD-M/mITX, MSI MS-6178.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4891 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index 1106d630ec6b1c87c99d4c341168beddbd8e441c..5fef0a94699b5b57098cd2763858b673ef5d3c80 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -420,7 +420,7 @@ config FALLBACK_VGA_BIOS_FILE
          The path and filename of the file to use as VGA BIOS.
 
 config FALLBACK_VGA_BIOS_ID
-       string "VGA BIOS ID"
+       string "VGA device PCI IDs"
        depends on VGA_BIOS
        default "1106,3230"
        help

diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 2af7401c55196bc88839663912b1e730a9831bda..65a6895513419fef2a8e6e94bc1357c660d51b33 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -60,3 +60,9 @@ config MAX_PHYSICAL_CPUS
        int
        default 2
        depends on BOARD_KONTRON_986LCD_M
+
+config FALLBACK_VGA_BIOS_FILE
+       string
+       default "amipci_01.20"
+       depends on BOARD_KONTRON_986LCD_M
+

diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index 7da2d77d802cdbaa401a51c4d5e83c8249a4968e..930f27f38b67fb1850506837b627a477f14f25f4 100644 (file)
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -49,3 +49,9 @@ config IRQ_SLOT_COUNT
        default 4
        depends on BOARD_MSI_MS_6178
 
+# No need to override the chipset FALLBACK_VGA_BIOS_ID.
+config FALLBACK_VGA_BIOS_FILE
+       string
+       default "i810.vga"
+       depends on BOARD_MSI_MS_6178
+

diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index 4f9a2bae573be0a66a1461ef0da92fec2f20e5bf..9b88aad1e1c8ce226717c832a7873f78e10e2fcc 100644 (file)
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -42,3 +42,13 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        default 0xaa51
        depends on BOARD_VIA_PC2500E
 
+config FALLBACK_VGA_BIOS_FILE
+       string
+       default "M14CRT.ROM"
+       depends on BOARD_VIA_PC2500E
+
+config FALLBACK_VGA_BIOS_ID
+       string
+       default "1106,3344"
+       depends on BOARD_VIA_PC2500E
+

diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig
index dc939b42d2b18efbd40dd1725407213f25cb7ca4..61495cea2f5eabf72e836afd503a0e872d0fed77 100644 (file)
--- a/src/northbridge/intel/i82810/Kconfig
+++ b/src/northbridge/intel/i82810/Kconfig
@@ -43,3 +43,8 @@ config VIDEO_MB
        default 1   if I810_VIDEO_MB_1MB
        depends on NORTHBRIDGE_INTEL_I82810
 
+config FALLBACK_VGA_BIOS_ID
+       string
+       default "8086,7121"
+       depends on NORTHBRIDGE_INTEL_I82810
+

diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index a73584719a89180fa606624fa7ce2b5f8a6f61dc..4f3aadd81761f4ae5ea46a9a9aa8222467945e67 100644 (file)
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -20,3 +20,9 @@
 config NORTHBRIDGE_INTEL_I945
        bool
        select HAVE_HIGH_TABLES
+
+config FALLBACK_VGA_BIOS_ID
+       string
+       default "8086,27a2"
+       depends on NORTHBRIDGE_INTEL_I945
+