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 424b2e1ed944c85e86c1ce2c0fde67e9380fb4cc..aec7d2ab015849e1bf4a6310fcb8c28984dc4b78 100644 (file)
--- a/src/mainboard/digitallogic/adl855pc/romstage.c
+++ b/src/mainboard/digitallogic/adl855pc/romstage.c
@@ -4,12 +4,10 @@
 #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/mc146818rtc.h>
 #include <console/console.h>
-#include "lib/ramtest.c"
 #include "southbridge/intel/i82801dx/i82801dx.h"
 #include "southbridge/intel/i82801dx/i82801dx_early_smbus.c"
 #include "northbridge/intel/i855/raminit.h"
@@ -17,6 +15,7 @@
 #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)
 
@@ -34,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 },
                },
        };
 
@@ -56,15 +55,13 @@ 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
@@ -79,4 +76,3 @@ void main(unsigned long bist)
        ram_check(0x80000000, 0x81000000);
 #endif
 }
-