Drop excessive whitespace randomly sprinkled in romstage.c files.

[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 d8bd7608cfd554b65b9759a2f9cf35daf2685571..24167baebed38c482edb9ac9e7446d29d380108c 100644 (file)
--- a/src/mainboard/via/epia/romstage.c
+++ b/src/mainboard/via/epia/romstage.c
@@ -5,8 +5,7 @@
 #include <arch/romcc_io.h>
 #include <arch/hlt.h>
 #include <stdlib.h>
-#include "pc80/serial.c"
-#include "console/console.c"
+#include <console/console.h>
 #include "lib/ramtest.c"
 #include "northbridge/via/vt8601/raminit.h"
 #include "cpu/x86/mtrr/earlymtrr.c"
@@ -16,6 +15,7 @@
 #include "lib/debug.c"
 #include "southbridge/via/vt8231/vt8231_early_smbus.c"
 #include "southbridge/via/vt8231/vt8231_early_serial.c"
+#include "southbridge/via/vt8231/vt8231_enable_rom.c"
 
 static inline int spd_read_byte(unsigned device, unsigned address)
 {
@@ -23,17 +23,14 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 }
 
 #include "northbridge/via/vt8601/raminit.c"
-/*
-  #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");
        }
@@ -41,7 +38,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
@@ -49,7 +46,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.
@@ -64,7 +61,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;
@@ -75,7 +72,7 @@ static void enable_shadow_ram(void)
        pci_write_config8(dev, 0x63, shadowreg);
 }
 
-void main(unsigned long bist)
+static void main(unsigned long bist)
 {
        if (bist == 0) {
                early_mtrr_init();
@@ -86,7 +83,8 @@ void main(unsigned long bist)
 
        /* Halt if there was a built in self test failure */
        report_bist_failure(bist);
-       
+
+       vt8231_enable_rom();
        enable_mainboard_devices();
        enable_smbus();
        enable_shadow_ram();
@@ -98,7 +96,7 @@ 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);
@@ -120,4 +118,3 @@ void main(unsigned long bist)
        }
 #endif
 }
-