Update to the latest AMD Fam10 microcode patches.

Add platform option for patch file name.

Signed-off-by: Marc Jones <marc.jones@amd.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3434 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

5 files changed, 115 insertions, 89 deletions

diff --git a/src/config/Options.lb b/src/config/Options.lb
index 6da8006040..bb5f5704d5 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -1061,6 +1061,12 @@ define CONFIG_AMDMCT
 	comment "use AMD MCT to init RAM instead of native code"
 end
 
+define AMD_UCODE_PATCH_FILE
+	default none
+	export used
+	format "\"%s\""
+	comment "name of the micorcode patch file"
+
 define CONFIG_VIDEO_MB
         default none
         export used
diff --git a/src/cpu/amd/model_10xxx/mc_patch_01000065.h b/src/cpu/amd/model_10xxx/mc_patch_01000083.h
index 82a9113d90..7a37962ac1 100644
--- a/src/cpu/amd/model_10xxx/mc_patch_01000065.h
+++ b/src/cpu/amd/model_10xxx/mc_patch_01000083.h
@@ -33,12 +33,12 @@
 */
 
 
-0x08, 0x20, 0x11, 0x01, 0x65, 0x00, 0x00, 0x01, 0x00, 0x80, 0x20, 0x00,
-0x9B, 0x78, 0x67, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x08, 0x20, 0x30, 0x04, 0x83, 0x00, 0x00, 0x01, 0x00, 0x80, 0x20, 0x00,
+0xA8, 0x88, 0x43, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x22, 0x10, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0x70, 0x09, 0x00, 0x00,
 0x49, 0x01, 0x00, 0x00, 0x8B, 0x01, 0x00, 0x00, 0xC1, 0x08, 0x00, 0x00,
 0xAA, 0x0B, 0x00, 0x00, 0x56, 0x0F, 0x00, 0x00, 0x9E, 0x0B, 0x00, 0x00,
-0x9A, 0x0B, 0x00, 0x00, 0x2A, 0xFF, 0xFF, 0x29, 0xC3, 0x5F, 0xD0, 0xC1,
+0x70, 0x0C, 0x00, 0x00, 0x2A, 0xFF, 0xFF, 0x29, 0xC3, 0x5F, 0xD0, 0xC1,
 0xBD, 0xFF, 0xFF, 0xB3, 0x0F, 0xFF, 0x7E, 0xFD, 0xF6, 0x1F, 0xF8, 0x57,
 0x3C, 0xBC, 0x63, 0x2D, 0x80, 0x96, 0xD6, 0x00, 0xAA, 0xFF, 0xEF, 0xAF,
 0xE0, 0xD1, 0x9F, 0x15, 0x57, 0xEF, 0xFF, 0xFF, 0xEA, 0x87, 0x7F, 0xBF,
@@ -49,7 +49,7 @@
 0xEB, 0x3F, 0x97, 0xFF, 0x9F, 0xEB, 0xFF, 0xE0, 0x97, 0xFF, 0x5E, 0xFE,
 0x7F, 0xAE, 0xFA, 0x83, 0xC9, 0x1A, 0x00, 0x08, 0x8C, 0xFF, 0xAF, 0xF2,
 0xFC, 0x53, 0xDD, 0x3F, 0xFB, 0xFF, 0x3F, 0xCB, 0xF0, 0x8F, 0x55, 0xFD,
-0x5F, 0x53, 0x39, 0x00, 0x81, 0x3F, 0xB6, 0xD7, 0x14, 0x40, 0x0D, 0x00,
+0x5F, 0x53, 0x39, 0x00, 0x81, 0x3F, 0xB6, 0xD7, 0x10, 0x40, 0x0D, 0x00,
 0x78, 0xF7, 0xFF, 0x07, 0x1F, 0x8E, 0xA9, 0xE8, 0xE5, 0xFF, 0xFA, 0x4F,
 0x7F, 0xF8, 0x97, 0xFA, 0x80, 0xFF, 0xC0, 0x3F, 0xBF, 0xE1, 0x1F, 0xC0,
 0x00, 0xFE, 0xBF, 0x07, 0x01, 0xFC, 0x67, 0xEB, 0x00, 0x07, 0xFE, 0xDE,
@@ -66,54 +66,55 @@
 0x00, 0x8C, 0x6F, 0xE5, 0x3E, 0x07, 0xFD, 0x00, 0x00, 0xD0, 0xFF, 0x3D,
 0x7F, 0x05, 0xF8, 0xFF, 0x5A, 0x3C, 0xF8, 0xE7, 0x7F, 0x02, 0x70, 0x01,
 0x01, 0xD7, 0xE1, 0x8F, 0xFE, 0x80, 0xFF, 0x03, 0x2B, 0x80, 0x07, 0x7F,
-0x09, 0x00, 0x48, 0x7D, 0x95, 0x03, 0x80, 0xFF, 0x03, 0x7A, 0x1D, 0xF8,
-0xEF, 0x3F, 0xC0, 0xFF, 0x0F, 0xE0, 0xFF, 0xF0, 0xFF, 0xBF, 0x2A, 0xFF,
-0xBF, 0x57, 0xFF, 0xC1, 0x40, 0x0D, 0x00, 0x30, 0x8E, 0xC6, 0x01, 0xF8,
-0xFC, 0x01, 0x01, 0x1E, 0xFC, 0xFF, 0x1F, 0x00, 0x78, 0x87, 0x42, 0x7E,
-0xD7, 0x68, 0x1C, 0x80, 0xC1, 0x1F, 0x10, 0xE0, 0xFE, 0xBF, 0x07, 0x00,
-0x3C, 0xF1, 0xFF, 0xBF, 0x0F, 0xFF, 0x00, 0x3F, 0xF0, 0xBF, 0x8D, 0x07,
-0x1D, 0xF8, 0x7B, 0x7B, 0xC0, 0x7F, 0xE0, 0x1F, 0xDF, 0xF0, 0x0F, 0xE0,
-0x00, 0x63, 0x54, 0x03, 0x01, 0xEE, 0xFF, 0xFF, 0xFF, 0x87, 0x7F, 0x00,
-0x6D, 0xF9, 0xFF, 0xFE, 0xFA, 0x0F, 0xFE, 0xB5, 0x07, 0x60, 0x4A, 0x2B,
-0xF0, 0x39, 0xE8, 0x07, 0x01, 0x80, 0x7C, 0xAE, 0x7F, 0x00, 0xFF, 0x81,
+0x09, 0x00, 0x48, 0x7D, 0x95, 0x03, 0x30, 0xE5, 0x03, 0x7A, 0x1D, 0xF8,
+0xF7, 0xFF, 0xCB, 0xFF, 0xEF, 0xD5, 0x7F, 0xF0, 0x5E, 0x39, 0x00, 0x53,
+0x3F, 0x80, 0xCF, 0x41, 0x40, 0x0D, 0x00, 0x30, 0xFF, 0xCA, 0x01, 0xC0,
+0xFC, 0x01, 0xBD, 0x0E, 0xFF, 0xF7, 0x1F, 0xE0, 0xF8, 0x07, 0xF0, 0x7F,
+0xFF, 0xFF, 0x5F, 0x95, 0xE0, 0xDF, 0xAB, 0xFF, 0xFE, 0xBF, 0x07, 0x00,
+0x5C, 0x46, 0xFF, 0x01, 0x0F, 0xFE, 0xD8, 0x00, 0x60, 0x6F, 0xE0, 0x4F,
+0x3A, 0xFC, 0x32, 0xD0, 0xCA, 0x7F, 0xE0, 0x9F, 0xF3, 0xF0, 0x0F, 0xF0,
+0x00, 0x02, 0x50, 0x03, 0x4A, 0xFE, 0x83, 0xFF, 0x9F, 0x87, 0x7F, 0x80,
+0x7F, 0x79, 0xEA, 0xFF, 0x7E, 0x1E, 0xFE, 0x01, 0x0F, 0xE0, 0xFF, 0x1B,
+0x06, 0x38, 0xF0, 0xF7, 0x01, 0x00, 0x33, 0xA0, 0x7F, 0x00, 0xFF, 0x81,
 0x80, 0x7F, 0xC3, 0x3F, 0xFE, 0x01, 0xFC, 0x07, 0x00, 0xFE, 0x0D, 0xFF,
 0xF8, 0x07, 0xF0, 0x1F, 0x03, 0xF8, 0x37, 0xFC, 0xD7, 0x00, 0x40, 0x34,
 0xC0, 0x3F, 0x80, 0xFF, 0x1F, 0xC0, 0xBF, 0xE1, 0x03, 0xFF, 0x00, 0xFE,
 0x7F, 0x00, 0xFF, 0x86, 0x0F, 0xFC, 0x03, 0xF8, 0xFE, 0x01, 0xFC, 0x1B,
 0x9A, 0x6B, 0x00, 0x00, 0x7F, 0xF2, 0x1F, 0xC0, 0xF0, 0xED, 0x65, 0x7F,
 0xFF, 0x81, 0x7F, 0x00, 0xC3, 0x3F, 0x80, 0x7F, 0xFC, 0x07, 0xFE, 0x01,
-0x0D, 0xFF, 0x00, 0xFE, 0xF0, 0xFF, 0x3D, 0x00, 0xE5, 0xFF, 0xFD, 0x1F,
-0x7F, 0xF8, 0x87, 0xBA, 0x80, 0xFF, 0xC0, 0x3F, 0xFF, 0xE1, 0x0B, 0x4A,
-0x09, 0xF8, 0xFF, 0xFF, 0x5B, 0x87, 0x5F, 0x06, 0x00, 0xF8, 0xFF, 0x1E,
-0xFF, 0x81, 0x00, 0xFF, 0xFC, 0x3C, 0xFC, 0x03, 0x0E, 0x00, 0x7E, 0x55,
-0xE0, 0x73, 0xD0, 0x0F, 0x7F, 0x7B, 0xFF, 0xA1, 0xDD, 0xFF, 0xC1, 0xBF,
-0x0F, 0x00, 0xFC, 0x7F, 0xFC, 0x03, 0x1E, 0x0C, 0xED, 0x00, 0xBE, 0xFD,
-0xFF, 0x5F, 0xE5, 0xF1, 0x07, 0xF8, 0x79, 0xF8, 0xAA, 0x1C, 0x80, 0xFB,
-0x1F, 0xC0, 0xE7, 0xA0, 0xBF, 0x07, 0x00, 0xFE, 0x06, 0xFA, 0x01, 0x0F,
-0xFC, 0x76, 0xFC, 0xDF, 0x1F, 0xF8, 0x07, 0xF0, 0xFC, 0x03, 0xF8, 0x37,
-0x7F, 0xE0, 0x1F, 0xC0, 0xF0, 0x0F, 0xE0, 0xDF, 0xFD, 0xDF, 0x03, 0x00,
-0xF0, 0xBF, 0x72, 0x00, 0x83, 0x7E, 0x00, 0x9F, 0x28, 0xF6, 0xFF, 0xFF,
-0x1E, 0xFE, 0x01, 0x7E, 0xE0, 0x3F, 0xF0, 0x0F, 0x6F, 0xF8, 0x07, 0xF0,
-0x80, 0xFE, 0xEF, 0x01, 0x20, 0xFF, 0xFE, 0xFF, 0xE2, 0xC3, 0x3F, 0xD0,
-0xBF, 0xFC, 0xBF, 0xFE, 0x3F, 0x0F, 0xFF, 0x00, 0x03, 0xF0, 0x55, 0x8D,
-0x02, 0x1C, 0xF8, 0x03, 0x00, 0x00, 0x18, 0xD5, 0x3F, 0x80, 0xFF, 0xC0,
-0xC0, 0xBF, 0xE1, 0x1F, 0xFF, 0x00, 0xFE, 0x03, 0x00, 0xFF, 0x86, 0x7F,
-0xFC, 0x03, 0xF8, 0x0F, 0x01, 0xFC, 0x1B, 0xFE, 0x6B, 0x00, 0xE0, 0xAE,
-0x56, 0x0E, 0x80, 0xCF, 0x0F, 0xE8, 0x75, 0xE0, 0xFF, 0xFF, 0x00, 0xF6,
-0xBB, 0x16, 0xF2, 0xC3, 0x39, 0xF8, 0x13, 0xB4, 0x7F, 0x0C, 0xB8, 0x0E,
-0xE7, 0x35, 0x00, 0x20, 0xFF, 0xFF, 0x1F, 0x60, 0x78, 0xC7, 0xA2, 0x7F,
-0xFF, 0xE9, 0x3F, 0x95, 0xE0, 0xCF, 0x2A, 0xDF, 0xFE, 0x03, 0xFF, 0x00,
-0x86, 0x7F, 0x00, 0xFF, 0xF8, 0xFF, 0x1E, 0x00, 0xF0, 0x1F, 0xF8, 0x07,
-0x37, 0xFC, 0x03, 0xF8, 0xC0, 0x7F, 0xE0, 0x1F, 0xDF, 0xF0, 0x0F, 0xE0,
+0x0D, 0xFF, 0x00, 0xFE, 0xF0, 0xFF, 0x3D, 0x00, 0xE0, 0x3B, 0x1A, 0x07,
+0x78, 0xF0, 0x07, 0x04, 0x00, 0xF0, 0xFF, 0x7F, 0xF9, 0xE1, 0x1D, 0x0A,
+0x00, 0x5E, 0xA3, 0x71, 0x80, 0x07, 0x7F, 0x40, 0x00, 0xF8, 0xFF, 0x1E,
+0x8F, 0xF2, 0xFF, 0xFE, 0xDD, 0x3F, 0xFC, 0x43, 0x1F, 0xC0, 0x7F, 0xE0,
+0xA5, 0xFF, 0xF0, 0x05, 0xFF, 0x04, 0xFC, 0xFF, 0x83, 0xAD, 0xC3, 0x2F,
+0x0F, 0x00, 0xFC, 0x7F, 0xFF, 0xFF, 0x38, 0x80, 0x01, 0x7E, 0x1E, 0xFE,
+0x2A, 0x07, 0x00, 0xBF, 0x07, 0xF0, 0x39, 0xE8, 0xD0, 0xBF, 0xBD, 0xFF,
+0xDF, 0xEE, 0xFF, 0xE0, 0xBF, 0x07, 0x00, 0xFE, 0x06, 0xFE, 0x01, 0x0F,
+0xFE, 0x76, 0x00, 0xDF, 0xF8, 0xFF, 0xAF, 0xF2, 0xFC, 0x03, 0xFC, 0x3C,
+0x7D, 0x55, 0x0E, 0xC0, 0xD0, 0x0F, 0xE0, 0x73, 0xFF, 0xDF, 0x03, 0x00,
+0x07, 0x03, 0xFD, 0x80, 0x6F, 0x7E, 0x3B, 0xFE, 0xF8, 0x0F, 0xFC, 0x03,
+0x1B, 0xFE, 0x01, 0xFC, 0xE0, 0x3F, 0xF0, 0x0F, 0x6F, 0xF8, 0x07, 0xF0,
+0x80, 0xFE, 0xEF, 0x01, 0x00, 0xF8, 0x5F, 0x39, 0xCF, 0x41, 0x3F, 0x80,
+0x7F, 0x14, 0xFB, 0xFF, 0x3F, 0x0F, 0xFF, 0x00, 0x07, 0xF0, 0x1F, 0xF8,
+0xF8, 0x37, 0xFC, 0x03, 0x00, 0x40, 0xFF, 0xF7, 0x7F, 0x90, 0x7F, 0xFF,
+0x68, 0xF1, 0xE1, 0x1F, 0xFF, 0x5F, 0xFE, 0x5F, 0x80, 0x9F, 0x87, 0x7F,
+0xC6, 0x01, 0xF8, 0xAA, 0x01, 0x01, 0x0E, 0xFC, 0x6A, 0x00, 0x00, 0x8C,
+0xE0, 0x1F, 0xC0, 0x7F, 0x0F, 0xE0, 0xDF, 0xF0, 0x81, 0x7F, 0x00, 0xFF,
+0x3F, 0x80, 0x7F, 0xC3, 0x07, 0xFE, 0x01, 0xFC, 0xFF, 0x00, 0xFE, 0x0D,
+0xD7, 0x35, 0x00, 0x70, 0x67, 0x2B, 0x07, 0xC0, 0xF0, 0x07, 0xF4, 0x3A,
+0xFB, 0xFF, 0x7F, 0x00, 0xE1, 0x5D, 0x0B, 0xF9, 0xDC, 0x1C, 0xFC, 0x09,
+0x87, 0x3F, 0x06, 0x5C, 0x90, 0xF3, 0x1A, 0x00, 0xB0, 0xFF, 0xFF, 0x0F,
+0x3F, 0xBC, 0x63, 0xD1, 0xCA, 0xFF, 0xF4, 0x9F, 0x6F, 0xF0, 0x67, 0x95,
 0x00, 0xFF, 0x81, 0x7F, 0x7F, 0xC3, 0x3F, 0x80, 0x00, 0xFC, 0x7F, 0x0F,
-0x03, 0xF8, 0x0F, 0xFC, 0xFC, 0x1B, 0xFE, 0x01, 0x0F, 0xE0, 0x3F, 0xF0,
-0xF0, 0x6F, 0xF8, 0x07, 0x3F, 0x80, 0xFF, 0xC0, 0xC0, 0xBF, 0xE1, 0x1F,
-0x07, 0x00, 0xFE, 0xBF, 0xFE, 0x01, 0xFC, 0x07, 0x00, 0xFE, 0x0D, 0xFF,
+0x7F, 0xF9, 0xDF, 0xFF, 0xFE, 0x0F, 0xFE, 0xBD, 0x07, 0xE0, 0x11, 0xE8,
+0xF6, 0x7A, 0xF0, 0xF7, 0x3F, 0x80, 0xFF, 0xC0, 0xC0, 0xBF, 0xE1, 0x1F,
+0x07, 0x00, 0xFE, 0xBF, 0xFF, 0x81, 0xFC, 0x2F, 0x00, 0x3F, 0x0F, 0xFF,
 0xF8, 0x07, 0xF0, 0x1F, 0x03, 0xF8, 0x37, 0xFC, 0xE0, 0x1F, 0xC0, 0x7F,
-0x0F, 0xE0, 0xDF, 0xF0, 0xDF, 0x03, 0x00, 0xFF, 0x03, 0xFF, 0x00, 0xFE,
+0x0F, 0xE0, 0xDF, 0xF0, 0x23, 0x03, 0x00, 0x8E, 0x03, 0xFF, 0x00, 0xFE,
 0x7F, 0x00, 0xFF, 0x86, 0x0F, 0xFC, 0x03, 0xF8, 0xFE, 0x01, 0xFC, 0x1B,
 0x3F, 0xF0, 0x0F, 0xE0, 0xF8, 0x07, 0xF0, 0x6F, 0xFF, 0xEF, 0x01, 0x80,
 
+
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/src/cpu/amd/model_10xxx/mc_patch_01000066.h b/src/cpu/amd/model_10xxx/mc_patch_01000084.h
index acffabd6aa..0b0e943234 100644
--- a/src/cpu/amd/model_10xxx/mc_patch_01000066.h
+++ b/src/cpu/amd/model_10xxx/mc_patch_01000084.h
@@ -33,12 +33,12 @@
 */
 
 
-0x08, 0x20, 0x11, 0x01, 0x66, 0x00, 0x00, 0x01, 0x00, 0x80, 0x20, 0x00,
-0x83, 0x75, 0xF0, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x08, 0x20, 0x01, 0x05, 0x84, 0x00, 0x00, 0x01, 0x00, 0x80, 0x20, 0x00,
+0x90, 0x85, 0xCC, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x20, 0x10, 0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA, 0x70, 0x09, 0x00, 0x00,
 0x49, 0x01, 0x00, 0x00, 0x8B, 0x01, 0x00, 0x00, 0xC1, 0x08, 0x00, 0x00,
 0xFF, 0xFF, 0xFF, 0xFF, 0x56, 0x0F, 0x00, 0x00, 0x9E, 0x0B, 0x00, 0x00,
-0x9A, 0x0B, 0x00, 0x00, 0x2A, 0xFF, 0xFF, 0x29, 0xC3, 0x5F, 0xD0, 0xC1,
+0x70, 0x0C, 0x00, 0x00, 0x2A, 0xFF, 0xFF, 0x29, 0xC3, 0x5F, 0xD0, 0xC1,
 0xBD, 0xFF, 0xFF, 0xB3, 0x0F, 0xFF, 0x7E, 0xFD, 0xF6, 0x1F, 0xF8, 0x57,
 0x3C, 0xBC, 0x63, 0x2D, 0x80, 0x96, 0xD6, 0x00, 0xAA, 0xFF, 0xEF, 0xAF,
 0xE0, 0xD1, 0x9F, 0x15, 0x57, 0xEF, 0xFF, 0xFF, 0xEA, 0x87, 0x7F, 0xBF,
@@ -49,7 +49,7 @@
 0xEB, 0x3F, 0x97, 0xFF, 0x9F, 0xEB, 0xFF, 0xE0, 0x97, 0xFF, 0x5E, 0xFE,
 0x7F, 0xAE, 0xFA, 0x83, 0xC9, 0x1A, 0x00, 0x08, 0x8C, 0xFF, 0xAF, 0xF2,
 0xFC, 0x53, 0xDD, 0x3F, 0xFB, 0xFF, 0x3F, 0xCB, 0xF0, 0x8F, 0x55, 0xFD,
-0x5F, 0x53, 0x39, 0x00, 0x81, 0x3F, 0xB6, 0xD7, 0x14, 0x40, 0x0D, 0x00,
+0x5F, 0x53, 0x39, 0x00, 0x81, 0x3F, 0xB6, 0xD7, 0x10, 0x40, 0x0D, 0x00,
 0x78, 0xF7, 0xFF, 0x07, 0x1F, 0x8E, 0xA9, 0xE8, 0xE5, 0xFF, 0xFA, 0x4F,
 0x7F, 0xF8, 0x97, 0xFA, 0x80, 0xFF, 0xC0, 0x3F, 0xBF, 0xE1, 0x1F, 0xC0,
 0x00, 0xFE, 0xBF, 0x07, 0x01, 0xFC, 0x67, 0xEB, 0x00, 0x07, 0xFE, 0xDE,
@@ -66,54 +66,55 @@
 0x00, 0x8C, 0x6F, 0xE5, 0x3E, 0x07, 0xFD, 0x00, 0x00, 0xD0, 0xFF, 0x3D,
 0x7F, 0x05, 0xF8, 0xFF, 0x5A, 0x3C, 0xF8, 0xE7, 0x7F, 0x02, 0x70, 0x01,
 0x01, 0xD7, 0xE1, 0x8F, 0xFE, 0x80, 0xFF, 0x03, 0x2B, 0x80, 0x07, 0x7F,
-0x09, 0x00, 0x48, 0x7D, 0x95, 0x03, 0x80, 0xFF, 0x03, 0x7A, 0x1D, 0xF8,
-0xEF, 0x3F, 0xC0, 0xFF, 0x0F, 0xE0, 0xFF, 0xF0, 0xFF, 0xBF, 0x2A, 0xFF,
-0xBF, 0x57, 0xFF, 0xC1, 0x40, 0x0D, 0x00, 0x30, 0x8E, 0xC6, 0x01, 0xF8,
-0xFC, 0x01, 0x01, 0x1E, 0xFC, 0xFF, 0x1F, 0x00, 0x78, 0x87, 0x42, 0x7E,
-0xD7, 0x68, 0x1C, 0x80, 0xC1, 0x1F, 0x10, 0xE0, 0xFE, 0xBF, 0x07, 0x00,
-0x3C, 0xF1, 0xFF, 0xBF, 0x0F, 0xFF, 0x00, 0x3F, 0xF0, 0xBF, 0x8D, 0x07,
-0x1D, 0xF8, 0x7B, 0x7B, 0xC0, 0x7F, 0xE0, 0x1F, 0xDF, 0xF0, 0x0F, 0xE0,
-0x00, 0x63, 0x54, 0x03, 0x01, 0xEE, 0xFF, 0xFF, 0xFF, 0x87, 0x7F, 0x00,
-0x6D, 0xF9, 0xFF, 0xFE, 0xFA, 0x0F, 0xFE, 0xB5, 0x07, 0x60, 0x4A, 0x2B,
-0xF0, 0x39, 0xE8, 0x07, 0x01, 0x80, 0x7C, 0xAE, 0x7F, 0x00, 0xFF, 0x81,
+0x09, 0x00, 0x48, 0x7D, 0x95, 0x03, 0x30, 0xE5, 0x03, 0x7A, 0x1D, 0xF8,
+0xF7, 0xFF, 0xCB, 0xFF, 0xEF, 0xD5, 0x7F, 0xF0, 0x5E, 0x39, 0x00, 0x53,
+0x3F, 0x80, 0xCF, 0x41, 0x40, 0x0D, 0x00, 0x30, 0xFF, 0xCA, 0x01, 0xC0,
+0xFC, 0x01, 0xBD, 0x0E, 0xFF, 0xF7, 0x1F, 0xE0, 0xF8, 0x07, 0xF0, 0x7F,
+0xFF, 0xFF, 0x5F, 0x95, 0xE0, 0xDF, 0xAB, 0xFF, 0xFE, 0xBF, 0x07, 0x00,
+0x5C, 0x46, 0xFF, 0x01, 0x0F, 0xFE, 0xD8, 0x00, 0x60, 0x6F, 0xE0, 0x4F,
+0x3A, 0xFC, 0x32, 0xD0, 0xCA, 0x7F, 0xE0, 0x9F, 0xF3, 0xF0, 0x0F, 0xF0,
+0x00, 0x02, 0x50, 0x03, 0x4A, 0xFE, 0x83, 0xFF, 0x9F, 0x87, 0x7F, 0x80,
+0x7F, 0x79, 0xEA, 0xFF, 0x7E, 0x1E, 0xFE, 0x01, 0x0F, 0xE0, 0xFF, 0x1B,
+0x06, 0x38, 0xF0, 0xF7, 0x01, 0x00, 0x33, 0xA0, 0x7F, 0x00, 0xFF, 0x81,
 0x80, 0x7F, 0xC3, 0x3F, 0xFE, 0x01, 0xFC, 0x07, 0x00, 0xFE, 0x0D, 0xFF,
 0xF8, 0x07, 0xF0, 0x1F, 0x03, 0xF8, 0x37, 0xFC, 0xD7, 0x00, 0x40, 0x34,
 0xC0, 0x3F, 0x80, 0xFF, 0x1F, 0xC0, 0xBF, 0xE1, 0x03, 0xFF, 0x00, 0xFE,
 0x7F, 0x00, 0xFF, 0x86, 0x0F, 0xFC, 0x03, 0xF8, 0xFE, 0x01, 0xFC, 0x1B,
 0x9A, 0x6B, 0x00, 0x00, 0x7F, 0xF2, 0x1F, 0xC0, 0xF0, 0xED, 0x65, 0x7F,
 0xFF, 0x81, 0x7F, 0x00, 0xC3, 0x3F, 0x80, 0x7F, 0xFC, 0x07, 0xFE, 0x01,
-0x0D, 0xFF, 0x00, 0xFE, 0xF0, 0xFF, 0x3D, 0x00, 0xE5, 0xFF, 0xFD, 0x1F,
-0x7F, 0xF8, 0x87, 0xBA, 0x80, 0xFF, 0xC0, 0x3F, 0xFF, 0xE1, 0x0B, 0x4A,
-0x09, 0xF8, 0xFF, 0xFF, 0x5B, 0x87, 0x5F, 0x06, 0x00, 0xF8, 0xFF, 0x1E,
-0xFF, 0x81, 0x00, 0xFF, 0xFC, 0x3C, 0xFC, 0x03, 0x0E, 0x00, 0x7E, 0x55,
-0xE0, 0x73, 0xD0, 0x0F, 0x7F, 0x7B, 0xFF, 0xA1, 0xDD, 0xFF, 0xC1, 0xBF,
-0x0F, 0x00, 0xFC, 0x7F, 0xFC, 0x03, 0x1E, 0x0C, 0xED, 0x00, 0xBE, 0xFD,
-0xFF, 0x5F, 0xE5, 0xF1, 0x07, 0xF8, 0x79, 0xF8, 0xAA, 0x1C, 0x80, 0xFB,
-0x1F, 0xC0, 0xE7, 0xA0, 0xBF, 0x07, 0x00, 0xFE, 0x06, 0xFA, 0x01, 0x0F,
-0xFC, 0x76, 0xFC, 0xDF, 0x1F, 0xF8, 0x07, 0xF0, 0xFC, 0x03, 0xF8, 0x37,
-0x7F, 0xE0, 0x1F, 0xC0, 0xF0, 0x0F, 0xE0, 0xDF, 0xFD, 0xDF, 0x03, 0x00,
-0xF0, 0xBF, 0x72, 0x00, 0x83, 0x7E, 0x00, 0x9F, 0x28, 0xF6, 0xFF, 0xFF,
-0x1E, 0xFE, 0x01, 0x7E, 0xE0, 0x3F, 0xF0, 0x0F, 0x6F, 0xF8, 0x07, 0xF0,
-0x80, 0xFE, 0xEF, 0x01, 0x20, 0xFF, 0xFE, 0xFF, 0xE2, 0xC3, 0x3F, 0xD0,
-0xBF, 0xFC, 0xBF, 0xFE, 0x3F, 0x0F, 0xFF, 0x00, 0x03, 0xF0, 0x55, 0x8D,
-0x02, 0x1C, 0xF8, 0x03, 0x00, 0x00, 0x18, 0xD5, 0x3F, 0x80, 0xFF, 0xC0,
-0xC0, 0xBF, 0xE1, 0x1F, 0xFF, 0x00, 0xFE, 0x03, 0x00, 0xFF, 0x86, 0x7F,
-0xFC, 0x03, 0xF8, 0x0F, 0x01, 0xFC, 0x1B, 0xFE, 0x6B, 0x00, 0xE0, 0xAE,
-0x56, 0x0E, 0x80, 0xCF, 0x0F, 0xE8, 0x75, 0xE0, 0xFF, 0xFF, 0x00, 0xF6,
-0xBB, 0x16, 0xF2, 0xC3, 0x39, 0xF8, 0x13, 0xB4, 0x7F, 0x0C, 0xB8, 0x0E,
-0xE7, 0x35, 0x00, 0x20, 0xFF, 0xFF, 0x1F, 0x60, 0x78, 0xC7, 0xA2, 0x7F,
-0xFF, 0xE9, 0x3F, 0x95, 0xE0, 0xCF, 0x2A, 0xDF, 0xFE, 0x03, 0xFF, 0x00,
-0x86, 0x7F, 0x00, 0xFF, 0xF8, 0xFF, 0x1E, 0x00, 0xF0, 0x1F, 0xF8, 0x07,
-0x37, 0xFC, 0x03, 0xF8, 0xC0, 0x7F, 0xE0, 0x1F, 0xDF, 0xF0, 0x0F, 0xE0,
+0x0D, 0xFF, 0x00, 0xFE, 0xF0, 0xFF, 0x3D, 0x00, 0xE0, 0x3B, 0x1A, 0x07,
+0x78, 0xF0, 0x07, 0x04, 0x00, 0xF0, 0xFF, 0x7F, 0xF9, 0xE1, 0x1D, 0x0A,
+0x00, 0x5E, 0xA3, 0x71, 0x80, 0x07, 0x7F, 0x40, 0x00, 0xF8, 0xFF, 0x1E,
+0x8F, 0xF2, 0xFF, 0xFE, 0xDD, 0x3F, 0xFC, 0x43, 0x1F, 0xC0, 0x7F, 0xE0,
+0xA5, 0xFF, 0xF0, 0x05, 0xFF, 0x04, 0xFC, 0xFF, 0x83, 0xAD, 0xC3, 0x2F,
+0x0F, 0x00, 0xFC, 0x7F, 0xFF, 0xFF, 0x38, 0x80, 0x01, 0x7E, 0x1E, 0xFE,
+0x2A, 0x07, 0x00, 0xBF, 0x07, 0xF0, 0x39, 0xE8, 0xD0, 0xBF, 0xBD, 0xFF,
+0xDF, 0xEE, 0xFF, 0xE0, 0xBF, 0x07, 0x00, 0xFE, 0x06, 0xFE, 0x01, 0x0F,
+0xFE, 0x76, 0x00, 0xDF, 0xF8, 0xFF, 0xAF, 0xF2, 0xFC, 0x03, 0xFC, 0x3C,
+0x7D, 0x55, 0x0E, 0xC0, 0xD0, 0x0F, 0xE0, 0x73, 0xFF, 0xDF, 0x03, 0x00,
+0x07, 0x03, 0xFD, 0x80, 0x6F, 0x7E, 0x3B, 0xFE, 0xF8, 0x0F, 0xFC, 0x03,
+0x1B, 0xFE, 0x01, 0xFC, 0xE0, 0x3F, 0xF0, 0x0F, 0x6F, 0xF8, 0x07, 0xF0,
+0x80, 0xFE, 0xEF, 0x01, 0x00, 0xF8, 0x5F, 0x39, 0xCF, 0x41, 0x3F, 0x80,
+0x7F, 0x14, 0xFB, 0xFF, 0x3F, 0x0F, 0xFF, 0x00, 0x07, 0xF0, 0x1F, 0xF8,
+0xF8, 0x37, 0xFC, 0x03, 0x00, 0x40, 0xFF, 0xF7, 0x7F, 0x90, 0x7F, 0xFF,
+0x68, 0xF1, 0xE1, 0x1F, 0xFF, 0x5F, 0xFE, 0x5F, 0x80, 0x9F, 0x87, 0x7F,
+0xC6, 0x01, 0xF8, 0xAA, 0x01, 0x01, 0x0E, 0xFC, 0x6A, 0x00, 0x00, 0x8C,
+0xE0, 0x1F, 0xC0, 0x7F, 0x0F, 0xE0, 0xDF, 0xF0, 0x81, 0x7F, 0x00, 0xFF,
+0x3F, 0x80, 0x7F, 0xC3, 0x07, 0xFE, 0x01, 0xFC, 0xFF, 0x00, 0xFE, 0x0D,
+0xD7, 0x35, 0x00, 0x70, 0x67, 0x2B, 0x07, 0xC0, 0xF0, 0x07, 0xF4, 0x3A,
+0xFB, 0xFF, 0x7F, 0x00, 0xE1, 0x5D, 0x0B, 0xF9, 0xDC, 0x1C, 0xFC, 0x09,
+0x87, 0x3F, 0x06, 0x5C, 0x90, 0xF3, 0x1A, 0x00, 0xB0, 0xFF, 0xFF, 0x0F,
+0x3F, 0xBC, 0x63, 0xD1, 0xCA, 0xFF, 0xF4, 0x9F, 0x6F, 0xF0, 0x67, 0x95,
 0x00, 0xFF, 0x81, 0x7F, 0x7F, 0xC3, 0x3F, 0x80, 0x00, 0xFC, 0x7F, 0x0F,
-0x03, 0xF8, 0x0F, 0xFC, 0xFC, 0x1B, 0xFE, 0x01, 0x0F, 0xE0, 0x3F, 0xF0,
-0xF0, 0x6F, 0xF8, 0x07, 0x3F, 0x80, 0xFF, 0xC0, 0xC0, 0xBF, 0xE1, 0x1F,
-0x07, 0x00, 0xFE, 0xBF, 0xFE, 0x01, 0xFC, 0x07, 0x00, 0xFE, 0x0D, 0xFF,
+0x7F, 0xF9, 0xDF, 0xFF, 0xFE, 0x0F, 0xFE, 0xBD, 0x07, 0xE0, 0x11, 0xE8,
+0xF6, 0x7A, 0xF0, 0xF7, 0x3F, 0x80, 0xFF, 0xC0, 0xC0, 0xBF, 0xE1, 0x1F,
+0x07, 0x00, 0xFE, 0xBF, 0xFF, 0x81, 0xFC, 0x2F, 0x00, 0x3F, 0x0F, 0xFF,
 0xF8, 0x07, 0xF0, 0x1F, 0x03, 0xF8, 0x37, 0xFC, 0xE0, 0x1F, 0xC0, 0x7F,
-0x0F, 0xE0, 0xDF, 0xF0, 0xDF, 0x03, 0x00, 0xFF, 0x03, 0xFF, 0x00, 0xFE,
+0x0F, 0xE0, 0xDF, 0xF0, 0x23, 0x03, 0x00, 0x8E, 0x03, 0xFF, 0x00, 0xFE,
 0x7F, 0x00, 0xFF, 0x86, 0x0F, 0xFC, 0x03, 0xF8, 0xFE, 0x01, 0xFC, 0x1B,
 0x3F, 0xF0, 0x0F, 0xE0, 0xF8, 0x07, 0xF0, 0x6F, 0xFF, 0xEF, 0x01, 0x80,
 
+
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/model_10xxx/update_microcode.c
index 32d7750dcc..8b61a6e5df 100644
--- a/src/cpu/amd/model_10xxx/update_microcode.c
+++ b/src/cpu/amd/model_10xxx/update_microcode.c
@@ -31,14 +31,22 @@ static const u8 microcode_updates[] __attribute__ ((aligned(16))) = {
 
 #ifdef __ROMCC__
 
-	// Barcelona rev Ax
-//		#include "mc_patch_01000020.h"
-
-	// Barcelona rev B0, B1, BA
-//		#include "mc_patch_01000066.h"
+/* From the Revision Guide :
+ * Equivalent Processor Table for AMD Family 10h Processors
+ *
+ * Installed Processor   Equivalent Processor   Patch Level
+ * Revision ID           Revision ID
+ * 00100F00h             1000h                  01000020h
+ * 00100F01h             1000h                  01000020h
+ * 00100F02h             1000h                  01000020h
+ * 00100F20h             1020h                  01000084h
+ * 00100F21h             1020h                  01000084h
+ * 00100F2Ah             1020h                  01000084h
+ * 00100F22h             1022h                  01000083h
+ * 00100F23h             1022h                  01000083h
+ */
 
-	// Barcelona rev B2, B3
-		#include "mc_patch_01000065.h"
+#include AMD_UCODE_PATCH_FILE
 
 #endif
 	/*  Dummy terminator  */
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
index 1382aa2d55..ada80daff8 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Options.lb
@@ -114,6 +114,7 @@ uses CONFIG_AMDMCT
 
 uses CONFIG_USE_PRINTK_IN_CAR
 uses CAR_FAM10
+uses AMD_UCODE_PATCH_FILE
 
 ###
 ### Build options
@@ -260,6 +261,15 @@ default MAINBOARD_VENDOR="AMD"
 default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x1022
 default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2b80
 
+##
+## Set microcode patch file name
+##
+##	Barcelona rev Ax:  "mc_patch_01000020.h"
+##	Barcelona rev B0, B1, BA: "mc_patch_01000084.h"
+##	Barcelona rev B2, B3: "mc_patch_01000083.h"
+##
+default AMD_UCODE_PATCH_FILE="mc_patch_01000083.h"
+
 ###
 ### coreboot layout values
 ###