printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / northbridge / amd / amdfam10 / raminit_amdmct.c

diff --git a/src/northbridge/amd/amdfam10/raminit_amdmct.c b/src/northbridge/amd/amdfam10/raminit_amdmct.c
index 3ea22c5e4c1c53c85f83522d26a1649ada22155a..4b33fd6f867e9aec9ca1a97ab3da814265abb042 100644 (file)
--- a/src/northbridge/amd/amdfam10/raminit_amdmct.c
+++ b/src/northbridge/amd/amdfam10/raminit_amdmct.c
@@ -20,24 +20,19 @@
 
 static  void print_raminit(const char *strval, u32 val)
 {
-       printk_debug("%s%08x\n", strval, val);
+       printk(BIOS_DEBUG, "%s%08x\n", strval, val);
 }
 
-
-#define RAMINIT_DEBUG 1
-
-
 static  void print_tx(const char *strval, u32 val)
 {
-#if RAMINIT_DEBUG == 1
+#if CONFIG_DEBUG_RAM_SETUP
        print_raminit(strval, val);
 #endif
 }
 
-
 static  void print_t(const char *strval)
 {
-#if RAMINIT_DEBUG == 1
+#if CONFIG_DEBUG_RAM_SETUP
        print_debug(strval);
 #endif
 }
@@ -63,10 +58,10 @@ static  void print_t(const char *strval)
 #include "../amdmct/mct/mctndi_d.c"
 #include "../amdmct/mct/mctchi_d.c"
 
-#if SYSTEM_TYPE == SERVER
+#if CONFIG_CPU_SOCKET_TYPE == 0x10
 //L1
 #include "../amdmct/mct/mctardk3.c"
-#elif SYSTEM_TYPE == DESKTOP
+#elif CONFIG_CPU_SOCKET_TYPE == 0x11
 //AM2
 #include "../amdmct/mct/mctardk4.c"
 //#elif SYSTEM_TYPE == MOBILE
@@ -149,9 +144,15 @@ u32 mctGetLogicalCPUID(u32 Node)
        case 0x10023:
                ret = AMD_DR_B3;
                break;
-       case 0x10062:
+       case 0x10042:
                ret = AMD_RB_C2;
                break;
+       case 0x10062:
+               ret = AMD_DA_C2;
+               break;
+       case 0x10080:
+               ret = AMD_HY_D0;
+               break;
        default:
                /* FIXME: mabe we should die() here. */
                print_err("FIXME! CPU Version unknown or not supported! \n");