Simplify a few code chunks, fix whitespace and indentation.

[coreboot.git] / src / mainboard / digitallogic / adl855pc / romstage.c

diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c
index 731e681253ffba5ee64f466e91bef62a6a3fa72a..aec7d2ab015849e1bf4a6310fcb8c28984dc4b78 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/romstage.c
+++ b/src/mainboard/digitallogic/adl855pc/romstage.c
@@ -4,20 +4,18 @@
 #include <device/pnp_def.h>
 #include <arch/romcc_io.h>
 #include <arch/hlt.h>
-//#include "option_table.h"
 #include <stdlib.h>
 #include "pc80/udelay_io.c"
-#include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c"
-#include "console/console.c"
-#include "lib/ramtest.c"
+#include <pc80/mc146818rtc.h>
+#include <console/console.h>
 #include "southbridge/intel/i82801dx/i82801dx.h"
 #include "southbridge/intel/i82801dx/i82801dx_early_smbus.c"
 #include "northbridge/intel/i855/raminit.h"
 #include "northbridge/intel/i855/debug.c"
-#include "superio/winbond/w83627hf/w83627hf_early_serial.c" 
+#include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "cpu/x86/bist.h"
+#include <spd.h>
 
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
@@ -35,7 +33,7 @@ void main(unsigned long bist)
        static const struct mem_controller memctrl[] = {
                {
                        .d0 = PCI_DEV(0, 0, 1),
-                       .channel0 = { (0xa<<3)|0, 0 },
+                       .channel0 = { DIMM0, 0 },
                },
        };
 
@@ -45,7 +43,7 @@ void main(unsigned long bist)
                init_timer();
 #endif
        }
-        
+
         w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
         uart_init();
         console_init();
@@ -57,16 +55,14 @@ void main(unsigned long bist)
        print_pci_devices();
 #endif
 
-       if(!bios_reset_detected()) {
+       if (!bios_reset_detected()) {
                enable_smbus();
 #if 0
                dump_spd_registers(&memctrl[0]);
                dump_smbus_registers();
 #endif
-
                sdram_initialize(ARRAY_SIZE(memctrl), memctrl);
-
-       } 
+       }
 
 #if 0
        dump_pci_devices();
@@ -76,8 +72,7 @@ void main(unsigned long bist)
        ram_check(0x00000000, msr.lo+(msr.hi<<32));
        // Check 16MB of memory @ 0
        ram_check(0x00000000, 0x01000000);
-       // Check 16MB of memory @ 2GB 
+       // Check 16MB of memory @ 2GB
        ram_check(0x80000000, 0x81000000);
 #endif
 }
-