From 02846565a9f09a08625deb2ee2afbd65c1918ff8 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Fri, 16 Apr 2004 15:37:21 +0000 Subject: [PATCH] move the vga step just a bit earlier. --- src/arch/i386/lib/hardwaremain.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/arch/i386/lib/hardwaremain.c b/src/arch/i386/lib/hardwaremain.c index 76fe3edf91..f3df9a513c 100644 --- a/src/arch/i386/lib/hardwaremain.c +++ b/src/arch/i386/lib/hardwaremain.c @@ -367,19 +367,13 @@ void hardwaremain(int boot_complete) final_mainboard_fixup(); post_code(0xec); - -#endif /* MAINBOARD_FIXUP_IN_CHARGE */ - -#ifdef USE_NEW_SUPERIO_INTERFACE - handle_superio(2, all_superio, nsuperio); -#endif - /* make certain we are the only cpu running in linuxBIOS */ - wait_for_other_cpus(); - // we do this right here because: // - all the hardware is working, and some VGA bioses seem to need // that // - we need page 0 below for linuxbios tables. + // This seems to be as early as possible to do this, since + // final_mainboard_fixup may need to run before we can do + // anything with vga. #if CONFIG_REALMODE_IDT == 1 printk_debug("INSTALL REAL-MODE IDT\n"); setup_realmode_idt(); @@ -390,6 +384,15 @@ void hardwaremain(int boot_complete) post_code(0x93); #endif +#endif /* MAINBOARD_FIXUP_IN_CHARGE */ + +#ifdef USE_NEW_SUPERIO_INTERFACE + handle_superio(2, all_superio, nsuperio); +#endif + /* make certain we are the only cpu running in linuxBIOS */ + wait_for_other_cpus(); + + /* Now that we have collected all of our information * write our configuration tables. */