diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2009-03-13 17:00:46 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2009-03-13 17:00:46 +0000 |
| commit | 65e9bc13f0588fa12ed3229bddd3ad87990c3470 (patch) | |
| tree | 798b2c6f6f9d1ff1ca50f743f396b7f36a4ce39d /src/mainboard/emulation/qemu-x86/mainboard.c | |
| parent | be7f79867e4d989fc9cb7fb9e8b0b8ec55956875 (diff) | |
This one is an example on how to drop vgabios.c from the mainboard or chipset
directories and use the global (v3) one in util/x86emu instead. It also fixes
the breakage introduced by 4000
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4001 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/emulation/qemu-x86/mainboard.c')
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/mainboard.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/mainboard/emulation/qemu-x86/mainboard.c b/src/mainboard/emulation/qemu-x86/mainboard.c index 99e289f334..7e3273a43e 100644 --- a/src/mainboard/emulation/qemu-x86/mainboard.c +++ b/src/mainboard/emulation/qemu-x86/mainboard.c @@ -3,21 +3,24 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ops.h> +#include <pc80/keyboard.h> #include <arch/io.h> #include "chip.h" -void vga_enable_console(); - static void vga_init(device_t dev) { - /* code to make vga init run in real mode - does work but against the current coreboot philosophy */ - printk_debug("INSTALL REAL-MODE IDT\n"); - setup_realmode_idt(); - printk_debug("DO THE VGA BIOS\n"); - do_vgabios(); - - vga_enable_console(); - + /* The VGA OPROM already lives at 0xc0000, + * force coreboot to use it. + */ + dev->on_mainboard = 1; + dev->rom_address = 0xc0000; + + /* Now do the usual initialization */ + pci_dev_init(dev); + + /* This sneaked in here, because Qemu does not + * emulate a SuperIO chip + */ init_pc_keyboard(0x60, 0x64, 0); } |