summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-10-30 12:56:59 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-10-30 12:56:59 +0000
commit81b3c0a10fe20493ecb8d4848cc27968ce822f95 (patch)
tree234ca66c0b8550575329e999e751db8e21ab0d5f
parent7943fe61df9e72721a8ceddb0120e4826552d5f9 (diff)
downloadcoreboot-81b3c0a10fe20493ecb8d4848cc27968ce822f95.tar.xz
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
-rw-r--r--src/Kconfig2
-rw-r--r--src/mainboard/kontron/986lcd-m/Kconfig6
-rw-r--r--src/mainboard/msi/ms6178/Kconfig6
-rw-r--r--src/mainboard/via/pc2500e/Kconfig10
-rw-r--r--src/northbridge/intel/i82810/Kconfig5
-rw-r--r--src/northbridge/intel/i945/Kconfig6
6 files changed, 34 insertions, 1 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 1106d630ec..5fef0a9469 100644
--- 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 2af7401c55..65a6895513 100644
--- 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 7da2d77d80..930f27f38b 100644
--- 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 4f9a2bae57..9b88aad1e1 100644
--- 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 dc939b42d2..61495cea2f 100644
--- 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 a73584719a..4f3aadd817 100644
--- 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
+