summaryrefslogtreecommitdiff
path: root/src/mainboard/msi
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-07-05 16:01:57 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-07-05 16:01:57 +0000
commit328bccc6103b4a61b527b8257768685973d5b333 (patch)
treecc877e76ce3260c503e244525071a5c6d49fa834 /src/mainboard/msi
parent76a88d0805a42f3759f1444ab62760f5160fc999 (diff)
Enable onboard VGA on the MS-6178 (i810 chipset) board (trivial).
Tested on hardware with the patch from r4398 and works fine as soon as Linux boots (no VGA in FILO for some reason, will investigate). In order to make the 'i810.vga' VGA blob from the vendor BIOS work you have to make the check for PCI device ID mismatches non-fatal (for now) in the src/devices/pci_rom.c file like this: Index: src/devices/pci_rom.c =================================================================== --- src/devices/pci_rom.c (Revision 4393) +++ src/devices/pci_rom.c (Arbeitskopie) @@ -87,7 +87,7 @@ if (dev->vendor != rom_data->vendor || dev->device != rom_data->device) { printk_err("Device or Vendor ID mismatch Vendor %04x, Device %04x\n", rom_data->vendor, rom_data->device); - return NULL; + // return NULL; } printk_spew("PCI ROM Image, Class Code %04x%02x, Code Type %02x\n", The reason is that the VGA blob thinks the proper VGA device ID is 0x7123 whereas it really is 0x7121 on hardware. There are multiple ways to work around this (there have been many discussions in the past), we'll see which method will be used in future... Note: This has been tested against r4393 only for now to make sure there are no problems because of the recent resource allocator changes, see http://www.coreboot.org/pipermail/coreboot/2009-July/050486.html. Tests with trunk will follow. 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@4399 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/msi')
-rw-r--r--src/mainboard/msi/ms6178/Config.lb8
-rw-r--r--src/mainboard/msi/ms6178/Options.lb2
-rw-r--r--src/mainboard/msi/ms6178/auto.c1
3 files changed, 6 insertions, 5 deletions
diff --git a/src/mainboard/msi/ms6178/Config.lb b/src/mainboard/msi/ms6178/Config.lb
index 391ccf0f6f..6c67a48065 100644
--- a/src/mainboard/msi/ms6178/Config.lb
+++ b/src/mainboard/msi/ms6178/Config.lb
@@ -77,11 +77,9 @@ chip northbridge/intel/i82810 # Northbridge
end
device pci_domain 0 on
device pci 0.0 on end # Host bridge
- device pci 1.0 off # Onboard video
- # chip drivers/pci/onboard
- # device pci 1.0 on end
- # register "rom_address" = "0xfff80000"
- # end
+ chip drivers/pci/onboard # Onboard VGA
+ device pci 1.0 on end
+ register "rom_address" = "0xfff80000" # 512 KB image
end
chip southbridge/intel/i82801xx # Southbridge
register "ide0_enable" = "1"
diff --git a/src/mainboard/msi/ms6178/Options.lb b/src/mainboard/msi/ms6178/Options.lb
index 6c09ca9225..f07733b73f 100644
--- a/src/mainboard/msi/ms6178/Options.lb
+++ b/src/mainboard/msi/ms6178/Options.lb
@@ -65,6 +65,7 @@ uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
uses CONFIG_CONSOLE_VGA
uses CONFIG_PCI_ROM_RUN
uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_VIDEO_MB
default CONFIG_ROM_SIZE = 512 * 1024
default CONFIG_HAVE_FALLBACK_BOOT = 1
@@ -98,4 +99,5 @@ default CONFIG_CONSOLE_VGA = 1
default CONFIG_PCI_ROM_RUN = 1
default CONFIG_CBFS = 1
default CONFIG_HAVE_HIGH_TABLES = 1
+default CONFIG_VIDEO_MB = 1
end
diff --git a/src/mainboard/msi/ms6178/auto.c b/src/mainboard/msi/ms6178/auto.c
index 9d91b13018..4f2e49b42b 100644
--- a/src/mainboard/msi/ms6178/auto.c
+++ b/src/mainboard/msi/ms6178/auto.c
@@ -36,6 +36,7 @@
#include "cpu/x86/bist.h"
#include "southbridge/intel/i82801xx/i82801xx_early_smbus.c"
#include "pc80/udelay_io.c"
+#include "lib/debug.c"
#include "northbridge/intel/i82810/raminit.c"
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)