Fixes for SONE

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1224 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/via/epia/Config.lb b/src/mainboard/via/epia/Config.lb
index 6e38977bf714fd4f49a72ca83dbe7b8cbd8e20f9..ba2d0b28af10feb8132a51956228202b6fdf9bc2 100644 (file)
--- a/src/mainboard/via/epia/Config.lb
+++ b/src/mainboard/via/epia/Config.lb
@@ -220,7 +220,7 @@ northbridge via/vt8601 "vt8601"
 #              pci 0:11.6
 #              pci 0:12.0
                register "enable_usb" = "0"
-               register "enable_native_ide" = "1"
+               register "enable_native_ide" = "0"
                register "enable_com_ports" = "1"
                register "enable_keyboard" = "0"
                register "enable_nvram" = "1"

diff --git a/src/mainboard/via/epia/auto.c b/src/mainboard/via/epia/auto.c
index d4a4d30ad30ca6b959c44b47e8b8bd0bbc160a2d..c1a6b9b98c693cc5d4ee3e678cc6b2ddf6760e49 100644 (file)
--- a/src/mainboard/via/epia/auto.c
+++ b/src/mainboard/via/epia/auto.c
@@ -11,6 +11,7 @@
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 #include "northbridge/via/vt8601/raminit.h"
+#include "cpu/p6/earlymtrr.c"
 /*
  */
 void udelay(int usecs) 
@@ -135,4 +136,5 @@ static void main(void)
                ram_check(check_addrs[i].lo, check_addrs[i].hi);
        }
 #endif
+       early_mtrr_init();
 }

diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c
index ea1f488f3e6bea03eb374d18c04926a7927ee8b7..55e833d7b5a5cba644fe9eadd2cd4d01f6b47c8f 100644 (file)
--- a/src/southbridge/via/vt8231/vt8231.c
+++ b/src/southbridge/via/vt8231/vt8231.c
@@ -335,11 +335,11 @@ static void vt8231_init(struct southbridge_via_vt8231_config *conf)
        //
        // IDE setup
        //
-       if (conf->enable_native_ide) {
+       if (! conf->enable_native_ide) {
                // Run the IDE controller in 'compatiblity mode - i.e. don't use PCI
                // interrupts.  Using PCI ints confuses linux for some reason.
                
-               printk_info("%s: enabling native IDE addresses\n", __FUNCTION__);
+               printk_info("%s: enabling compatibility IDE addresses\n", __FUNCTION__);
                enables = pci_read_config8(dev1, 0x42);
                printk_debug("enables in reg 0x42 0x%x\n", enables);
                enables &= ~0xc0;               // compatability mode