Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / mainboard / via / epia / romstage.c

diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c
index a40a9b22f888ec3af0344af972cc9ff566dc568b..66a8d203ed30803c602d9b85cd2ba4484e539609 100644 (file)
--- a/src/mainboard/via/epia/romstage.c
+++ b/src/mainboard/via/epia/romstage.c
@@ -1,6 +1,3 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
@@ -9,14 +6,13 @@
 #include <arch/hlt.h>
 #include <stdlib.h>
 #include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
+#include "console/console.c"
 #include "lib/ramtest.c"
 #include "northbridge/via/vt8601/raminit.h"
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "cpu/x86/bist.h"
 #include "pc80/udelay_io.c"
 #include "lib/delay.c"
-#include "cpu/x86/lapic/boot_cpu.c"
 #include "lib/debug.c"
 #include "southbridge/via/vt8231/vt8231_early_smbus.c"
 #include "southbridge/via/vt8231/vt8231_early_serial.c"
@@ -31,13 +27,13 @@ static inline int spd_read_byte(unsigned device, unsigned address)
   #include "lib/generic_sdram.c"
 */
 
-static void enable_mainboard_devices(void) 
+static void enable_mainboard_devices(void)
 {
        device_t dev;
        /* dev 0 for southbridge */
-  
+
        dev = pci_locate_device(PCI_ID(0x1106,0x8231), 0);
-  
+
        if (dev == PCI_DEV_INVALID) {
                die("Southbridge not found!!!\n");
        }
@@ -45,7 +41,7 @@ static void enable_mainboard_devices(void)
        pci_write_config8(dev, 0x50, 7);
        pci_write_config8(dev, 0x51, 0xff);
 #if 0
-       // This early setup switches IDE into compatibility mode before PCI gets 
+       // This early setup switches IDE into compatibility mode before PCI gets
        // a chance to assign I/Os
        //   movl    $CONFIG_ADDR(0, 0x89, 0x42), %eax
        //   movb    $0x09, %dl
@@ -53,7 +49,7 @@ static void enable_mainboard_devices(void)
        //   PCI_WRITE_CONFIG_BYTE
        //
 #endif
-       /* we do this here as in V2, we can not yet do raw operations 
+       /* we do this here as in V2, we can not yet do raw operations
         * to pci!
         */
        /* changed this to work correctly on later revisions of LB.
@@ -68,7 +64,7 @@ static void enable_mainboard_devices(void)
        pci_write_config8(dev, 0x42, 0);
 }
 
-static void enable_shadow_ram(void) 
+static void enable_shadow_ram(void)
 {
        device_t dev = 0;
        unsigned char shadowreg;
@@ -81,8 +77,6 @@ static void enable_shadow_ram(void)
 
 static void main(unsigned long bist)
 {
-       unsigned long x;
-       
        if (bist == 0) {
                early_mtrr_init();
        }
@@ -92,7 +86,7 @@ static void main(unsigned long bist)
 
        /* Halt if there was a built in self test failure */
        report_bist_failure(bist);
-       
+
        enable_mainboard_devices();
        enable_smbus();
        enable_shadow_ram();
@@ -104,7 +98,7 @@ static void main(unsigned long bist)
        sdram_set_registers((const struct mem_controller *) 0);
        sdram_set_spd_registers((const struct mem_controller *) 0);
        sdram_enable(0, (const struct mem_controller *) 0);
-       
+
        /* Check all of memory */
 #if 0
        ram_check(0x00000000, msr.lo);
@@ -126,3 +120,4 @@ static void main(unsigned long bist)
        }
 #endif
 }
+