Remove a few more warnings from fam10.

[coreboot.git] / src / cpu / amd / model_10xxx / update_microcode.c

diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/model_10xxx/update_microcode.c
index f996247d8dffbedd9a9d45a4c9a9f21f5ee5713e..b6c2c22945e0e88584908f88827bbd4022c0fdee 100644 (file)
--- a/src/cpu/amd/model_10xxx/update_microcode.c
+++ b/src/cpu/amd/model_10xxx/update_microcode.c
@@ -18,18 +18,20 @@
  */
 
 
-#ifndef __ROMCC__
+#ifndef __PRE_RAM__
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
+#endif
 
+#ifndef __ROMCC__
 #include <cpu/amd/microcode.h>
 #endif
 
 static const u8 microcode_updates[] __attribute__ ((aligned(16))) = {
 
-#ifdef __ROMCC__
+#ifdef __PRE_RAM__
 
 /* From the Revision Guide :
  * Equivalent Processor Table for AMD Family 10h Processors
@@ -44,6 +46,7 @@ static const u8 microcode_updates[] __attribute__ ((aligned(16))) = {
  * 00100F2Ah (DR-BA)     1020h                  01000096h
  * 00100F22h (DR-B2)     1022h                  01000095h
  * 00100F23h (DR-B3)     1022h                  01000095h
+ * 00100F42h (RB-C2)     1041h                  01000086h
  * 00100F62h (DA-C2)     1062h                  0100009Fh
  */
 
@@ -67,6 +70,7 @@ static u32 get_equivalent_processor_rev_id(u32 orig_id) {
                0x100f2A, 0x1020,
                0x100f22, 0x1022,
                0x100f23, 0x1022,
+               0x100f42, 0x1041,
                0x100f62, 0x1062,
        };
 
@@ -95,7 +99,7 @@ void update_microcode(u32 cpu_deviceid)
        if (equivalent_processor_rev_id != 0) {
                amd_update_microcode((void *) microcode_updates, equivalent_processor_rev_id);
        } else {
-               printk_debug("microcode: rev id not found. Skipping microcode patch!\n");
+               printk(BIOS_DEBUG, "microcode: rev id not found. Skipping microcode patch!\n");
        }
 
 }