Fix build with CONFIG_DEBUG_RAM_SETUP on Intel 440BX, use printk().

[coreboot.git] / src / northbridge / intel / i440bx / debug.c

diff --git a/src/northbridge/intel/i440bx/debug.c b/src/northbridge/intel/i440bx/debug.c
index 1d8cbf6a57b9b2ac15eaf035ee64610273407009..81b9fd8deb5de3b6e6af219fb02f0b2be874413b 100644 (file)
--- a/src/northbridge/intel/i440bx/debug.c
+++ b/src/northbridge/intel/i440bx/debug.c
@@ -1,66 +1,34 @@
 #include "raminit.h"
+#include <spd.h>
+#include <console/console.h>
 
 void dump_spd_registers(void)
 {
 #if CONFIG_DEBUG_RAM_SETUP
        int i;
-       print_debug("\n");
+       printk(BIOS_DEBUG, "\n");
        for(i = 0; i < DIMM_SOCKETS; i++) {
                unsigned device;
                device = DIMM0 + i;
                if (device) {
                        int j;
-                       print_debug("dimm: ");
-                       print_debug_hex8(i);
-                       print_debug(".0: ");
-                       print_debug_hex8(device);
+                       printk(BIOS_DEBUG, "DIMM %d: %02x", i, device);
                        for(j = 0; j < 256; j++) {
                                int status;
                                unsigned char byte;
                                if ((j & 0xf) == 0) {
-                                       print_debug("\n");
-                                       print_debug_hex8(j);
-                                       print_debug(": ");
+                                       printk(BIOS_DEBUG, "\n%02x: ", j);
                                }
                                status = spd_read_byte(device, j);
                                if (status < 0) {
-                                       print_debug("bad device\n");
+                                       printk(BIOS_DEBUG, "bad device\n");
                                        break;
                                }
                                byte = status & 0xff;
-                               print_debug_hex8(byte);
-                               print_debug_char(' ');
+                               printk(BIOS_DEBUG, "%02x ", byte);
                        }
-                       print_debug("\n");
+                       printk(BIOS_DEBUG, "\n");
                }
        }
 #endif
 }
-
-#if 0
-void dump_spd_registers(void)
-{
-       unsigned device;
-       device = SMBUS_MEM_DEVICE_START;
-       printk(BIOS_DEBUG, "\n");
-       while(device <= SMBUS_MEM_DEVICE_END) {
-               int status = 0;
-               int i;
-               printk(BIOS_DEBUG, "dimm %02x", device);
-               for(i = 0; (i < 256) && (status == 0); i++) {
-                       unsigned char byte;
-                       if ((i % 20) == 0) {
-                               printk(BIOS_DEBUG, "\n%3d: ", i);
-                       }
-                       status = smbus_read_byte(device, i, &byte);
-                       if (status != 0) {
-                               printk(BIOS_DEBUG, "bad device\n");
-                               continue;
-                       }
-                       printk(BIOS_DEBUG, "%02x ", byte);
-               }
-               device += SMBUS_MEM_DEVICE_INC;
-               printk(BIOS_DEBUG, "\n");
-       }
-}
-#endif