Drop per-board ram_check() calls for now.

[coreboot.git] / src / mainboard / artecgroup / dbe61 / romstage.c

diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c
index 48be6820c7ef1970f68b54e1f903c5548077fae9..7b213bf1c748bf7dc075bcd849e13ec20c9ae3d5 100644 (file)
--- a/src/mainboard/artecgroup/dbe61/romstage.c
+++ b/src/mainboard/artecgroup/dbe61/romstage.c
@@ -26,20 +26,16 @@
 #include <arch/hlt.h>
 #include <stdlib.h>
 #include <console/console.h>
-#include "lib/ramtest.c"
 #include "cpu/x86/bist.h"
 #include "cpu/x86/msr.h"
 #include <cpu/amd/lxdef.h>
 #include <cpu/amd/geode_post_code.h>
 #include "southbridge/amd/cs5536/cs5536.h"
 #include "spd_table.h"
-
+#include <spd.h>
 #include "southbridge/amd/cs5536/cs5536_early_smbus.c"
 #include "southbridge/amd/cs5536/cs5536_early_setup.c"
 
-#define DIMM0 0xA0
-#define DIMM1 0xA2
-
 static int spd_read_byte(unsigned device, unsigned address)
 {
        int i;
@@ -70,18 +66,13 @@ static int spd_read_byte(unsigned device, unsigned address)
 #include "cpu/amd/model_lx/syspreinit.c"
 #include "cpu/amd/model_lx/msrinit.c"
 
-static void mb_gpio_init(void)
-{
-       /* Early mainboard specific GPIO setup */
-}
-
 void main(unsigned long bist)
 {
        post_code(0x01);
 
        msr_t msr;
        static const struct mem_controller memctrl[] = {
-               {.channel0 = {(0xa << 3) | 0, (0xa << 3) | 1}}
+               {.channel0 = {DIMM0, DIMM1}}
        };
 
        SystemPreInit();
@@ -100,7 +91,6 @@ void main(unsigned long bist)
        msr.lo |= 0x7 << 20;
        wrmsr(MDD_LEG_IO, msr);
 
-       mb_gpio_init();
        uart_init();
        console_init();
 
@@ -109,11 +99,11 @@ void main(unsigned long bist)
 
        pll_reset(ManualConf);
 
-       cpuRegInit();
+       cpuRegInit(0, DIMM0, DIMM1, DRAM_TERMINATED);
 
        sdram_initialize(1, memctrl);
 
-       /* Dump memory configuratation */
+       /* Dump memory configuration. */
 #if 0
        msr = rdmsr(MC_CF07_DATA);
        print_debug("MC_CF07_DATA: ");
@@ -143,9 +133,4 @@ void main(unsigned long bist)
        msr = rdmsr(MC_CF8F_DATA);
        print_debug(" \n");
 #endif
-
-       /* Check memory. */
-       // ram_check(0x00000000, 640 * 1024);
-       // ram_check(1024 * 1024, 2 * 1024 * 1024);
 }
-