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

[coreboot.git] / src / mainboard / lippert / frontrunner / romstage.c

diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c
index 1ea608f7353730846c92a55c1692c5b1a6039ad6..87337a2be9bb540b6ea5dc774a12edc99612ddb9 100644 (file)
--- a/src/mainboard/lippert/frontrunner/romstage.c
+++ b/src/mainboard/lippert/frontrunner/romstage.c
@@ -1,6 +1,3 @@
-#define ASSEMBLY 1
-
-
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
@@ -8,7 +5,7 @@
 #include <arch/romcc_io.h>
 #include <arch/hlt.h>
 #include "pc80/serial.c"
-#include "arch/i386/lib/console.c"
+#include "console/console.c"
 #include "lib/ramtest.c"
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "cpu/x86/bist.h"
@@ -22,12 +19,12 @@
 #include "northbridge/amd/gx2/raminit.h"
 
 /* this has to be done on a per-mainboard basis, esp. if you don't have smbus */
-static void sdram_set_spd_registers(const struct mem_controller *ctrl) 
+static void sdram_set_spd_registers(const struct mem_controller *ctrl)
 {
        msr_t msr;
        /* 1. Initialize GLMC registers base on SPD values,
         * Hard coded as XpressROM for now */
-       //print_debug("sdram_enable step 1\r\n");
+       //print_debug("sdram_enable step 1\n");
        msr = rdmsr(0x20000018);
        msr.hi = 0x10076013;
        msr.lo = 0x3400;
@@ -70,12 +67,10 @@ static void msr_init(void)
         __builtin_wrmsr(0x40000029, 0x7bf00100, 0x2000000f);
         __builtin_wrmsr(0x4000002d, 0xff030003, 0x20000000);
 
-
         __builtin_wrmsr(0x50002001, 0x27, 0x0);
         __builtin_wrmsr(0x4c002001, 0x1, 0x0);
 }
 
-
 static void main(unsigned long bist)
 {
        static const struct mem_controller memctrl [] = {
@@ -104,7 +99,6 @@ static void main(unsigned long bist)
        outb( 0x87, 0x4E);                            //enter SuperIO configuration mode
        outb( 0x87, 0x4E);
 
-
        outb(0x20, 0x4e);
        temp = inb(0x4f);
        print_debug_hex8(temp);
@@ -134,3 +128,4 @@ static void main(unsigned long bist)
 //     ram_check(0x00000000, 640*1024);
 
 }
+