#include <device/pnp_def.h>
#include <arch/romcc_io.h>
#include <arch/hlt.h>
-//#include "option_table.h"
#include <stdlib.h>
+#include <lib.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)
#include "northbridge/intel/i855/raminit.c"
#include "northbridge/intel/i855/reset_test.c"
-#include "lib/generic_sdram.c"
void main(unsigned long bist)
{
- static const struct mem_controller memctrl[] = {
- {
- .d0 = PCI_DEV(0, 0, 1),
- .channel0 = { (0xa<<3)|0, 0 },
- },
- };
-
if (bist == 0) {
#if 0
enable_lapic();
init_timer();
#endif
}
-
+
w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
uart_init();
console_init();
print_pci_devices();
#endif
- if(!bios_reset_detected()) {
+ if (!bios_reset_detected()) {
enable_smbus();
#if 0
- dump_spd_registers(&memctrl[0]);
+ dump_spd_registers();
dump_smbus_registers();
#endif
-
- sdram_initialize(ARRAY_SIZE(memctrl), memctrl);
-
- }
+ sdram_set_registers();
+ sdram_set_spd_registers();
+ sdram_enable();
+ }
#if 0
dump_pci_devices();
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
}
-