From 65e9bc13f0588fa12ed3229bddd3ad87990c3470 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 13 Mar 2009 17:00:46 +0000 Subject: 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4001 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/emulation/qemu-x86/mainboard.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src/mainboard/emulation/qemu-x86/mainboard.c') 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 #include #include +#include #include #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); } -- cgit v1.2.3