vendorcode/amd/agesa/f16kb: Update Kabini PI from v1.0.0.0 to v1.0.0.7

The platform initialization (PI) code v1.0.0.7 for Kabini has some
enhancements like ECC DIMM support, new CPU microcode rev 0700010B, FCH
bug fix (RTC) and so on.

Use the name Kabini instead of Kerala everywhere.

Note, the former PI code was indeed version v1.0.0.0 instead of v0.0.1.0
as used in `AGESA_VERSION_STRING`.

Change-Id: I186de1aef222cd35ea69efa93967a3ffb8da7248
Signed-off-by: WANG Siyuan <SiYuan.Wang@amd.com>
Signed-off-by: WANG Siyuan <wangsiyuanbuaa@gmail.com>
Reviewed-on: http://review.coreboot.org/3935
Tested-by: build bot (Jenkins)
Reviewed-by: Bruce Griffith <Bruce.Griffith@se-eng.com>

6 files changed, 789 insertions, 4301 deletions

diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c
index 0ae46c605e..5ed8b60a00 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbCoreAfterReset.c
@@ -139,13 +139,13 @@ F16KbPmCoreAfterReset (
   LibAmdPciRead (AccessWidth32, PciAddress, &HwPsMaxVal, StdHeader);
   HwPsMaxVal = ((CLK_PWR_TIMING_CTRL2_REGISTER *) &HwPsMaxVal)->HwPstateMaxVal;
 
-  // Launch each local core to perform steps 1 through 3.
+  // Launch each local core to perform steps 1 through 4.
   TaskPtr.FuncAddress.PfApTask = F16KbPmCoreAfterResetPhase1OnCore;
   TaskPtr.DataTransfer.DataSizeInDwords = 0;
   TaskPtr.ExeFlags = WAIT_FOR_CORE;
   ApUtilRunCodeOnAllLocalCoresAtEarly (&TaskPtr, StdHeader, CpuEarlyParamsPtr);
 
-  // Launch each local core to perform steps 4 through 6.
+  // Launch each local core to perform steps 5 through 7.
   TaskPtr.FuncAddress.PfApTaskI = F16KbPmCoreAfterResetPhase2OnCore;
   TaskPtr.DataTransfer.DataSizeInDwords = 1;
   TaskPtr.DataTransfer.DataPtr = &HwPsMaxVal;
@@ -176,25 +176,36 @@ F16KbPmCoreAfterResetPhase1OnCore (
   IN       AMD_CONFIG_PARAMS *StdHeader
   )
 {
-  UINT64 CofvidSts;
-  UINT64 LocalMsrRegister;
-  UINT64 PstateCtrl;
+  BOOLEAN SkipStep3;
+  UINT64  CofvidSts;
+  UINT64  LocalMsrRegister;
+  UINT64  PstateCtrl;
 
   IDS_HDT_CONSOLE (CPU_TRACE, "  F16KbPmCoreAfterResetPhase1OnCore\n");
 
-  // 1. Write 0 to MSRC001_0062[PstateCmd] on all cores in the processor.
+  // 1. If MSRC001_0071[CurPstate] = MSRC001_0071[CurPstateLimit], then skip step 3 for that core
+  LibAmdMsrRead (MSR_COFVID_STS, &CofvidSts, StdHeader);
+  if (((COFVID_STS_MSR *) &CofvidSts)->CurPstate == ((COFVID_STS_MSR *) &CofvidSts)->CurPstateLimit) {
+    SkipStep3 = TRUE;
+  } else {
+    SkipStep3 = FALSE;
+  }
+
+  // 2. Write 0 to MSRC001_0062[PstateCmd] on all cores in the processor.
   PstateCtrl = 0;
   LibAmdMsrWrite (MSR_PSTATE_CTL, &PstateCtrl, StdHeader);
 
-  // 2. Wait for MSRC001_0071[CurCpuFid, CurCpuDid] = [CpuFid, CpuDid] from
+  // 3. Wait for MSRC001_0071[CurCpuFid, CurCpuDid] = [CpuFid, CpuDid] from
   //    MSRC001_00[6B:64] indexed by MSRC001_0071[CurPstateLimit].
-  do {
-    LibAmdMsrRead (MSR_COFVID_STS, &CofvidSts, StdHeader);
-    LibAmdMsrRead ((UINT32) (MSR_PSTATE_0 + (UINT32) (((COFVID_STS_MSR *) &CofvidSts)->CurPstateLimit)), &LocalMsrRegister, StdHeader);
-  } while ((((COFVID_STS_MSR *) &CofvidSts)->CurCpuFid != ((PSTATE_MSR *) &LocalMsrRegister)->CpuFid) ||
-           (((COFVID_STS_MSR *) &CofvidSts)->CurCpuDid != ((PSTATE_MSR *) &LocalMsrRegister)->CpuDid));
+  if (!SkipStep3) {
+    do {
+      LibAmdMsrRead (MSR_COFVID_STS, &CofvidSts, StdHeader);
+      LibAmdMsrRead ((UINT32) (MSR_PSTATE_0 + (UINT32) (((COFVID_STS_MSR *) &CofvidSts)->CurPstateLimit)), &LocalMsrRegister, StdHeader);
+    } while ((((COFVID_STS_MSR *) &CofvidSts)->CurCpuFid != ((PSTATE_MSR *) &LocalMsrRegister)->CpuFid) ||
+             (((COFVID_STS_MSR *) &CofvidSts)->CurCpuDid != ((PSTATE_MSR *) &LocalMsrRegister)->CpuDid));
+  }
 
-  // 3. Write MSRC001_0061[PstateMaxVal] to MSRC001_0062[PstateCmd] on all
+  // 4. Write MSRC001_0061[PstateMaxVal] to MSRC001_0062[PstateCmd] on all
   //    cores in the processor.
   LibAmdMsrRead (MSR_PSTATE_CURRENT_LIMIT, &LocalMsrRegister, StdHeader);
   ((PSTATE_CTRL_MSR *) &PstateCtrl)->PstateCmd = ((PSTATE_CURLIM_MSR *) &LocalMsrRegister)->PstateMaxVal;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c
index 37d0aa0ea3..45b1b8f418 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbDmi.c
@@ -344,7 +344,7 @@ DmiF16KbGetExtClock (
   IN       AMD_CONFIG_PARAMS  *StdHeader
   )
 {
-  return (EXTERNAL_CLOCK_DFLT);
+  return (EXTERNAL_CLOCK_100MHZ);
 }
 
 /* -----------------------------------------------------------------------------*/
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatch07000106_Enc.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
index 85bdc4e582..14fbfb2970 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatch07000106_Enc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbId7001MicrocodePatch.c
@@ -4,12 +4,12 @@
  *
  * AMD F16Kb Microcode patch.
  *
- * F16Kb Microcode Patch rev 07000106 for 7001 or equivalent.
+ * F16Kb Microcode Patch rev 0700010B for 7001 or equivalent.
  *
  * @xrefitem bom "File Content Label" "Release Content"
  * @e project:      AGESA
  * @e sub-project:  CPU/Family/0x16/KB
- * @e \$Revision: 86822 $   @e \$Date: 2013-01-28 00:17:14 -0500 (Mon, 28 Jan 2013) $
+ * @e \$Revision: 267923 $   @e \$Date: 2013-07-15 16:49:48 -0400 (Mon, 15 Jul 2013) $
  */
 /*****************************************************************************
  *
@@ -37,8 +37,8 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ***************************************************************************/
+ ******************************************************************************
+ */
 
 
 
@@ -63,16 +63,17 @@ RDATA_GROUP (G3_DXE)
  *----------------------------------------------------------------------------------------
  */
 
+UCODE_VS_FLAG (0700010B)
 
-// Encrypt Patch code 07000106 for 7001 and equivalent
+// Encrypt Patch code 0700010B for 7001 and equivalent
 
-CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
+CONST UINT8 ROMDATA CpuF16KbId7001MicrocodePatch [IDS_PAD_4K] =
 {
   0x13,
   0x20,
-  0x22,
-  0x01,
-  0x06,
+  0x09,
+  0x07,
+  0x0b,
   0x01,
   0x00,
   0x07,
@@ -100,262 +101,262 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0xaa,
   0xaa,
   0xaa,
-  0x49,
-  0x66,
-  0xa8,
-  0x8e,
-  0x7a,
-  0x20,
-  0xc7,
-  0xae,
-  0xe4,
-  0xf4,
-  0xb4,
-  0x4a,
-  0x32,
-  0x58,
-  0xbb,
-  0x8b,
+  0x1c,
+  0x8a,
+  0x19,
+  0x02,
+  0x24,
+  0xb6,
+  0x41,
+  0xb0,
   0x60,
+  0x6a,
+  0x6e,
+  0xc3,
+  0xdb,
+  0xae,
+  0xd9,
+  0xa3,
+  0x9e,
+  0x4c,
+  0x89,
+  0xd2,
+  0xe6,
+  0xb8,
+  0xb1,
+  0x81,
+  0x30,
+  0xbd,
   0x57,
+  0x94,
+  0x81,
+  0xa3,
+  0xbc,
+  0x81,
+  0x95,
+  0x47,
+  0xb5,
+  0x93,
+  0x5f,
+  0x8a,
+  0xf6,
+  0x82,
+  0xcd,
   0x0e,
+  0x4d,
+  0xd3,
+  0x26,
+  0xd8,
+  0xa8,
   0x35,
-  0x36,
-  0xda,
-  0x53,
-  0x69,
   0xb7,
-  0xaf,
-  0x84,
-  0xe0,
-  0x66,
-  0x54,
-  0x71,
-  0x2a,
-  0xef,
-  0x0f,
-  0xf0,
-  0x0e,
-  0x9d,
-  0x5a,
-  0xbe,
-  0xbe,
+  0x64,
+  0xba,
+  0x32,
+  0x33,
+  0x09,
+  0xfd,
+  0x93,
+  0xc6,
+  0x49,
   0x19,
-  0x2a,
-  0xe1,
+  0xe3,
   0x53,
-  0xdf,
-  0x30,
-  0x15,
-  0xe9,
-  0x9e,
-  0xa2,
-  0xb4,
-  0x74,
-  0x0f,
-  0xfa,
-  0x38,
-  0x6e,
-  0x5c,
-  0x08,
-  0xa5,
-  0xe5,
-  0xd7,
-  0xc3,
-  0x24,
-  0x04,
-  0x5c,
-  0x6e,
-  0xf5,
-  0x57,
-  0xb6,
-  0x2e,
-  0x41,
-  0x1d,
-  0x5d,
-  0xa2,
-  0x62,
+  0xc1,
+  0xb5,
+  0xcc,
+  0x2f,
+  0xf3,
+  0x52,
+  0xaa,
+  0xe3,
   0x9c,
-  0xce,
   0x79,
-  0xfb,
-  0xd8,
-  0xda,
-  0x01,
-  0x36,
-  0xfe,
-  0xcf,
-  0x18,
-  0x78,
-  0xcd,
+  0x52,
+  0x10,
+  0x5f,
+  0xff,
+  0x90,
+  0x29,
+  0x0b,
+  0xf1,
+  0x7f,
+  0xfa,
+  0x0c,
+  0x10,
+  0x75,
+  0x84,
+  0x74,
+  0x81,
   0x8b,
-  0x49,
-  0x92,
-  0x0a,
-  0x59,
-  0x40,
-  0x8f,
-  0xc9,
-  0x3e,
-  0xf6,
-  0xd7,
-  0xea,
+  0x63,
+  0xb3,
+  0x71,
+  0x20,
+  0x25,
+  0xc8,
+  0x16,
+  0x6d,
+  0xc2,
+  0xcc,
+  0xf7,
   0x78,
-  0x89,
-  0xc1,
-  0xea,
-  0xf8,
-  0x2e,
-  0x35,
-  0xf8,
-  0xfb,
-  0x15,
-  0x48,
-  0x8f,
-  0x07,
+  0x30,
+  0xb6,
+  0x2d,
+  0x81,
+  0x2b,
+  0xdd,
+  0xc4,
+  0x6b,
+  0xab,
+  0x31,
+  0x90,
+  0xa8,
+  0x6d,
+  0xd7,
+  0x6c,
+  0xae,
+  0x66,
+  0xe5,
+  0xdf,
+  0xd6,
+  0x65,
   0xd4,
-  0x3f,
-  0x1f,
-  0x85,
-  0x38,
-  0x87,
-  0x17,
+  0x95,
+  0xe5,
+  0x68,
+  0xae,
+  0x26,
+  0xa5,
+  0x48,
+  0xe6,
+  0xf5,
+  0xf3,
+  0x22,
+  0x67,
+  0xb9,
+  0x4d,
+  0x22,
   0x38,
-  0x23,
-  0x9b,
+  0x32,
+  0x51,
+  0x4b,
+  0x8a,
+  0x6b,
+  0xc1,
+  0x9c,
+  0xd2,
+  0xc3,
+  0x91,
+  0xb5,
+  0x43,
+  0xe9,
   0xcc,
-  0x4a,
-  0xea,
-  0xfd,
+  0x73,
   0x49,
-  0x5a,
-  0xfe,
-  0xb6,
-  0x11,
+  0x07,
+  0x7c,
+  0x7d,
+  0xe8,
+  0xc8,
+  0x5e,
+  0x56,
+  0x7a,
+  0x22,
+  0x80,
+  0xcc,
+  0xbd,
   0x21,
-  0xa6,
-  0x5d,
-  0x26,
+  0x1b,
+  0x32,
+  0x0d,
+  0xd4,
+  0x92,
+  0x62,
+  0x37,
+  0xaf,
+  0xf6,
+  0x18,
+  0xfa,
+  0x9f,
+  0x9f,
+  0x12,
+  0x6b,
+  0x4b,
+  0x4f,
+  0x1d,
   0x5a,
-  0x2e,
-  0xc9,
-  0x49,
-  0x4a,
-  0x2a,
-  0x5b,
-  0xc7,
-  0x8f,
-  0xde,
+  0xca,
+  0x3c,
+  0x7d,
+  0x7d,
+  0x38,
+  0x66,
+  0x00,
+  0x90,
+  0xc5,
+  0x7e,
+  0x44,
+  0xf3,
+  0xa8,
   0x65,
-  0x27,
-  0xfd,
-  0x9d,
-  0x59,
-  0x02,
-  0xf9,
-  0xad,
-  0x13,
-  0x4a,
-  0x19,
-  0xb9,
-  0x63,
+  0xc3,
   0x1b,
-  0x94,
-  0xd8,
-  0x24,
-  0x87,
-  0xd2,
-  0xfc,
+  0x41,
   0x1d,
-  0x4f,
-  0xa2,
-  0xf1,
-  0xf1,
-  0x4e,
-  0x1a,
-  0x8e,
-  0x7a,
-  0xbd,
-  0xaf,
+  0xef,
+  0xb3,
   0xd4,
-  0x24,
-  0x07,
-  0x3b,
   0x43,
-  0x2d,
-  0xe3,
-  0xbf,
-  0xc3,
-  0x03,
-  0x4c,
-  0x81,
-  0x9b,
-  0xec,
-  0x8a,
-  0x91,
-  0x7b,
-  0x1c,
-  0xe0,
-  0x70,
-  0xa4,
-  0x3f,
-  0x83,
-  0x4d,
+  0xb5,
+  0x02,
+  0x1a,
+  0x0d,
+  0x08,
+  0x44,
   0xa5,
-  0x4b,
-  0x9d,
-  0xbe,
-  0xfe,
-  0xdf,
-  0xed,
-  0xb8,
-  0xa9,
-  0x0e,
-  0xe1,
-  0x11,
-  0x71,
-  0x4d,
-  0xfa,
-  0x27,
-  0x32,
-  0x5c,
-  0xd1,
-  0xe9,
-  0x84,
-  0xbb,
-  0xeb,
+  0x57,
+  0xa7,
   0x65,
-  0x19,
+  0x90,
+  0xdc,
+  0xdc,
+  0x1e,
+  0xdf,
+  0x45,
+  0x5f,
+  0x88,
+  0xdc,
+  0x7c,
+  0xd6,
   0x09,
-  0xc9,
-  0x2f,
+  0x57,
+  0x01,
+  0x33,
+  0xfc,
+  0x47,
+  0xad,
+  0xa0,
+  0x49,
   0x0c,
-  0x80,
-  0x14,
-  0x3f,
-  0x94,
-  0x1f,
-  0xcd,
-  0xaf,
-  0x29,
-  0x51,
-  0x7c,
-  0x88,
-  0x36,
-  0xf3,
-  0xcb,
-  0x41,
-  0x20,
-  0xcb,
-  0x4c,
-  0x1c,
-  0x4b,
-  0xb2,
-  0xaa,
-  0x6c,
-  0x2c,
-  0xab,
-  0x37,
+  0x55,
+  0xc4,
+  0xfd,
+  0xf1,
+  0x68,
+  0xd2,
+  0x67,
+  0x0c,
+  0xf1,
+  0x92,
+  0xa4,
+  0x9b,
+  0x50,
+  0x34,
+  0x5d,
+  0xea,
+  0x58,
   0x5b,
   0x2a,
   0x58,
@@ -612,75 +613,75 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0xec,
   0x30,
   0xa7,
-  0x90,
-  0xd8,
-  0x99,
-  0x44,
-  0x85,
-  0xe7,
-  0x21,
-  0x33,
-  0x00,
-  0x48,
-  0xf3,
+  0x6f,
+  0x43,
   0xbb,
-  0x92,
-  0xe9,
-  0x48,
-  0x99,
-  0x45,
+  0xe7,
+  0x52,
+  0xbe,
+  0xc5,
+  0xeb,
+  0xc8,
+  0x2b,
+  0xb9,
+  0x40,
+  0x7d,
+  0x5a,
+  0xf8,
+  0x4c,
+  0x8e,
+  0x84,
+  0x64,
+  0xb9,
+  0x32,
+  0x38,
+  0x3d,
+  0xf8,
+  0x4e,
+  0xe5,
+  0x82,
+  0x87,
+  0xbe,
+  0x69,
+  0x3a,
   0x66,
-  0xd5,
-  0xe6,
-  0xd9,
-  0x9e,
-  0x92,
+  0xd0,
+  0x3c,
+  0x1e,
+  0x40,
+  0x14,
+  0xc0,
+  0x71,
+  0x12,
   0x8b,
-  0x42,
-  0x94,
-  0xa3,
-  0x2f,
-  0x44,
-  0xb1,
-  0x5e,
-  0x07,
-  0xd7,
-  0x0a,
-  0xb4,
-  0x7b,
-  0x49,
-  0x7e,
-  0x15,
-  0xab,
-  0x34,
-  0x6b,
-  0xff,
+  0xee,
   0x1f,
-  0xcf,
-  0x84,
-  0x7f,
-  0x57,
-  0x6c,
-  0xdb,
-  0xc3,
-  0x3e,
-  0xc1,
-  0xef,
-  0x05,
-  0xea,
-  0x39,
-  0xe0,
-  0xe6,
-  0x15,
-  0x4f,
-  0x9a,
-  0xdd,
-  0x93,
+  0x2b,
+  0x5f,
+  0xe9,
+  0x80,
+  0x1e,
+  0x10,
+  0x48,
+  0x1e,
+  0xcb,
+  0xba,
+  0x10,
+  0x22,
+  0x45,
+  0x67,
+  0xf3,
+  0xbd,
+  0x3f,
+  0x97,
+  0x86,
+  0x7d,
+  0x3f,
   0x01,
   0x00,
   0x00,
   0x00,
-  0x06,
+  0x0b,
   0x01,
   0x00,
   0x07,
@@ -698,14 +699,14 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x19,
   0x04,
   0x07,
-  0xf0,
-  0x0c,
-  0xf0,
-  0x0c,
-  0xf0,
-  0x0c,
-  0xf0,
-  0x0c,
+  0xda,
+  0x09,
+  0x4f,
+  0x15,
+  0x2e,
+  0x07,
+  0xe3,
+  0x16,
   0xf0,
   0x0c,
   0xf0,
@@ -892,7 +893,7 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x9f,
   0xc9,
   0xe7,
-  0x55,
+  0x52,
   0xa0,
   0x06,
   0x00,
@@ -1012,11 +1013,11 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x9d,
   0x4b,
   0xe1,
-  0x53,
+  0x50,
   0xa0,
   0x06,
   0x00,
-  0xd9,
+  0xd6,
   0xff,
   0xff,
   0x00,
@@ -1156,25 +1157,25 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0xa1,
   0x06,
   0x00,
+  0x78,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0xff,
+  0x29,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
+  0xe0,
+  0xe7,
+  0xfb,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0xff,
+  0x2b,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0xe0,
+  0xe7,
+  0xe6,
+  0x5c,
+  0x02,
   0x00,
   0xff,
   0x81,
@@ -1196,42 +1197,42 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0xbf,
   0x07,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
+  0x19,
+  0x19,
+  0xfe,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xcf,
+  0x03,
+  0xd7,
+  0xfd,
+  0xef,
   0xff,
-  0x81,
-  0x7f,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0x98,
+  0x8b,
+  0xfe,
+  0x4d,
+  0xa0,
+  0x06,
   0x00,
+  0x6f,
+  0xfa,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0x2d,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
+  0xe0,
+  0xe7,
+  0x19,
+  0x19,
+  0xfe,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xd7,
+  0xc3,
+  0xd6,
   0xff,
   0xbf,
   0x07,
@@ -1241,77 +1242,77 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x7f,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0x5b,
+  0x8b,
+  0xfe,
+  0x6f,
+  0xfa,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0x2e,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0xe0,
+  0xe7,
+  0x4b,
+  0xa0,
+  0x06,
   0x00,
   0xff,
-  0x81,
-  0x7f,
+  0xf9,
+  0x78,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xc1,
+  0x9f,
+  0xdb,
+  0xeb,
+  0xfd,
   0xff,
-  0x81,
-  0x7f,
+  0x38,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0xc1,
+  0x9f,
+  0xdb,
+  0xeb,
+  0xd7,
+  0xb8,
+  0x06,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
+  0xef,
+  0x5f,
+  0x3f,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xa0,
+  0x9f,
+  0xc9,
+  0xe7,
+  0x67,
+  0xfa,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0x2f,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0xe0,
+  0xe7,
+  0x4a,
+  0xa0,
+  0x06,
   0x00,
   0xff,
-  0x81,
-  0x7f,
+  0xcd,
+  0x78,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xa0,
+  0xdf,
+  0xcb,
+  0xe7,
   0xff,
-  0x81,
+  0xcd,
   0x7f,
-  0x00,
-  0xe1,
+  0x2a,
+  0xe0,
   0x1f,
-  0xc0,
-  0xbf,
+  0xe0,
+  0xe7,
   0xff,
   0xbf,
   0x07,
@@ -1692,9 +1693,9 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x1f,
   0xe0,
   0xac,
-  0x93,
+  0xff,
   0xbf,
-  0x06,
+  0x07,
   0x00,
   0xff,
   0xdd,
@@ -1716,6 +1717,66 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0xbf,
   0x07,
   0x00,
+  0x30,
+  0x5e,
+  0x39,
+  0x00,
+  0xc0,
+  0x1f,
+  0xd0,
+  0xeb,
+  0xdf,
+  0xff,
+  0xff,
+  0x2f,
+  0xe0,
+  0xdf,
+  0xab,
+  0xfa,
+  0xff,
+  0xbf,
+  0x07,
+  0x00,
+  0xee,
+  0xff,
+  0xff,
+  0x00,
+  0xe1,
+  0xdd,
+  0x0b,
+  0xf9,
+  0xf7,
+  0xff,
+  0xff,
+  0x2f,
+  0xe1,
+  0x0f,
+  0x20,
+  0xcb,
+  0x93,
+  0xbf,
+  0x06,
+  0x00,
+  0x6f,
+  0xfa,
+  0xff,
+  0x2e,
+  0xe1,
+  0x1f,
+  0xe0,
+  0xe7,
+  0xff,
+  0xdf,
+  0x78,
+  0x00,
+  0xa1,
+  0x9f,
+  0xcb,
+  0xe7,
+  0xff,
+  0xbf,
+  0x07,
+  0x00,
   0xff,
   0xd1,
   0x7f,
@@ -1816,34 +1877,34 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x5b,
   0x06,
   0x00,
+  0xfe,
+  0xef,
   0xff,
-  0x81,
-  0x7f,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0x98,
+  0x8b,
+  0xfe,
+  0x47,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0xff,
+  0x2d,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0xe0,
+  0xe7,
+  0x2b,
+  0xb2,
+  0x06,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
+  0x41,
+  0x19,
+  0xfe,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xd7,
+  0xc3,
+  0xd6,
   0xff,
   0x81,
   0x7f,
@@ -1857,393 +1918,333 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x07,
   0x00,
   0xff,
-  0x81,
+  0xff,
   0x7f,
-  0x00,
+  0x3f,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0x17,
+  0xe0,
+  0xca,
   0xff,
-  0x81,
+  0xf9,
   0x7f,
-  0x00,
+  0x3c,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0x17,
+  0xe0,
+  0xca,
   0xff,
   0xbf,
   0x07,
   0x00,
   0xff,
   0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
+  0x7a,
+  0x2c,
+  0xa0,
+  0x9f,
+  0xcb,
+  0xe7,
+  0xf7,
+  0xdf,
+  0x3a,
+  0x2c,
   0xc0,
-  0xbf,
+  0x9f,
+  0xdb,
+  0xeb,
   0xff,
   0xbf,
   0x07,
   0x00,
   0xff,
-  0x81,
-  0x7f,
+  0xff,
+  0xff,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xdd,
+  0x0b,
+  0xf9,
+  0xfe,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0xff,
+  0x2d,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0x4b,
+  0x6b,
+  0xcb,
   0xff,
   0xbf,
   0x07,
   0x00,
   0xff,
-  0x81,
+  0x5b,
   0x7f,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xa0,
+  0x9f,
+  0xc9,
+  0xe7,
+  0xe7,
+  0xff,
+  0xff,
+  0x26,
+  0xe0,
+  0x9f,
+  0xe9,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
   0xff,
   0xbf,
   0x07,
   0x00,
+  0xf4,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
   0xff,
-  0x81,
-  0x7f,
   0x00,
   0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xd7,
+  0xc3,
+  0xd6,
+  0x77,
+  0x5e,
+  0x3f,
+  0x00,
+  0xa0,
+  0x9f,
+  0xc9,
+  0xe7,
   0xff,
   0xbf,
   0x07,
   0x00,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
   0xbf,
+  0x2d,
+  0xe0,
+  0x1f,
+  0xe0,
+  0xe7,
+  0x0f,
   0xff,
-  0xbf,
-  0x07,
-  0x00,
+  0xfe,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
+  0xff,
+  0xcf,
   0xbf,
   0xff,
   0xbf,
   0x07,
   0x00,
   0xff,
-  0x81,
+  0xdb,
   0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0x2d,
+  0xe0,
+  0xdf,
+  0x6b,
+  0xf1,
+  0xcc,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
+  0xff,
+  0x2b,
+  0xe0,
   0x1f,
-  0xc0,
-  0xbf,
+  0xe0,
+  0xac,
   0xff,
   0xbf,
   0x07,
   0x00,
+  0xe0,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0xff,
+  0x28,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
+  0xe0,
+  0xac,
   0xff,
-  0x81,
+  0xd7,
   0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0x2d,
+  0xe0,
+  0x5f,
+  0xab,
+  0xff,
   0xff,
   0xbf,
   0x07,
   0x00,
+  0xf7,
+  0xdb,
+  0x3a,
+  0x2c,
+  0xa0,
+  0x9f,
+  0xcb,
+  0xe7,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xd1,
+  0x7a,
+  0x2c,
+  0xa0,
+  0x9f,
+  0xcb,
+  0xe7,
   0xff,
   0xbf,
   0x07,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
   0x00,
-  0xe1,
+  0xfe,
+  0x2b,
+  0xe0,
   0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0xe0,
+  0xe7,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
   0x00,
-  0xe1,
+  0xfe,
+  0x2d,
+  0xe0,
   0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
+  0xe0,
+  0xe7,
+  0x45,
+  0x9d,
+  0x06,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
   0x00,
-  0xe1,
-  0x1f,
-  0xc0,
   0xbf,
+  0x2a,
+  0xe0,
+  0x1f,
+  0xe0,
+  0xe7,
+  0x00,
+  0x80,
   0xff,
-  0x81,
   0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
+  0x80,
+  0x3e,
+  0xce,
   0xbf,
   0xff,
   0xbf,
   0x07,
   0x00,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
+  0x9f,
   0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
+  0x2a,
+  0xe0,
   0x1f,
-  0xc0,
-  0xbf,
+  0xe0,
+  0xe7,
   0xff,
-  0xbf,
-  0x07,
-  0x00,
+  0x5d,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
   0xff,
+  0xff,
+  0xcf,
   0xbf,
-  0x07,
+  0x45,
+  0x3d,
+  0x06,
   0x00,
+  0xb0,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
+  0x2b,
+  0xe0,
   0x1f,
+  0xe0,
+  0xe7,
   0xc0,
-  0xbf,
   0xff,
-  0xbf,
-  0x07,
-  0x00,
   0xff,
-  0x81,
-  0x7f,
+  0x2a,
+  0xe0,
+  0x1f,
+  0xe0,
+  0xac,
+  0x45,
+  0x3d,
+  0x06,
   0x00,
+  0x67,
+  0xfa,
+  0xff,
+  0x2f,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
+  0xe0,
+  0xe7,
   0xff,
-  0x81,
-  0x7f,
+  0xd5,
+  0x78,
   0x00,
-  0xe1,
-  0x1f,
   0xc0,
-  0xbf,
+  0xdf,
+  0xdb,
+  0xeb,
   0xff,
   0xbf,
   0x07,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
+  0x5f,
+  0x5e,
+  0x3f,
   0x00,
-  0xe1,
-  0x1f,
   0xc0,
-  0xbf,
+  0x9f,
+  0xda,
+  0xeb,
+  0xdf,
+  0xfb,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
+  0x2c,
   0xe1,
   0x1f,
-  0xc0,
-  0xbf,
+  0xe0,
+  0xe7,
   0xff,
   0xbf,
   0x07,
   0x00,
+  0xf7,
+  0xdf,
+  0x3a,
+  0x2c,
+  0xa0,
+  0x9f,
+  0xcb,
+  0xe7,
   0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
+  0xd1,
+  0x7a,
+  0x2c,
+  0xa0,
+  0x9f,
+  0xcb,
+  0xe7,
   0xff,
   0xbf,
   0x07,
   0x00,
-  0xff,
-  0x81,
-  0x7f,
+  0xf7,
+  0x5f,
+  0x3f,
   0x00,
-  0xe1,
-  0x1f,
   0xc0,
-  0xbf,
+  0x9f,
+  0xda,
+  0xeb,
   0xff,
   0x81,
   0x7f,
@@ -2252,9 +2253,9 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0x1f,
   0xc0,
   0xbf,
-  0xff,
-  0xbf,
-  0x07,
+  0x43,
+  0x5a,
+  0x06,
   0x00,
   0xff,
   0x81,
@@ -3436,62 +3437,62 @@ CONST UINT8 ROMDATA arr2 [IDS_PAD_4K] =
   0xbf,
   0x07,
   0x00,
-  0x13,
-  0x42,
-  0x99,
-  0xf4,
+  0xc6,
   0x9c,
-  0x43,
-  0x10,
-  0xb9,
-  0x93,
-  0x17,
-  0x40,
-  0x75,
-  0x1b,
-  0x3d,
-  0x9e,
-  0xa9,
-  0x4f,
-  0xbf,
-  0xac,
-  0x60,
-  0x92,
-  0x6b,
-  0xbb,
-  0x51,
-  0x50,
-  0x1a,
-  0x56,
   0xc0,
-  0x34,
-  0x59,
-  0xb6,
-  0x4a,
   0x30,
-  0x0a,
-  0x21,
-  0xa2,
-  0x14,
+  0x51,
+  0x9c,
+  0x16,
+  0x99,
+  0xb1,
+  0x07,
+  0xa3,
+  0x18,
+  0xeb,
+  0x9c,
+  0xf3,
+  0x3e,
+  0x48,
+  0xcf,
   0x1f,
-  0x8d,
-  0x89,
+  0xc7,
+  0xba,
+  0x80,
+  0xa7,
+  0x9c,
+  0x01,
+  0x99,
+  0xe3,
+  0xd8,
+  0xa3,
+  0xb5,
+  0xef,
+  0xca,
+  0x0e,
+  0x43,
+  0x9c,
   0xc4,
-  0x82,
-  0xb0,
-  0x5c,
+  0x4c,
+  0xa5,
+  0x9d,
+  0xa0,
+  0x33,
+  0x4e,
+  0xdd,
+  0xdf,
+  0x14,
+  0x59,
   0x8d,
-  0x49,
-  0x3d,
-  0xb8,
-  0x34,
-  0x7a,
-  0x54,
-  0xb2,
-  0xc2,
-  0x0e,
-  0x5b,
-  0xbc,
+  0x04,
+  0xfc,
+  0x03,
+  0x71,
+  0xc7,
+  0xd2,
+  0x99,
+  0xb6,
+  0x9d,
   0x00,
   0x00,
   0x00,
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
index 9c0e54baca..1e1b23dde8 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbInitEarlyTable.c
@@ -52,6 +52,7 @@
 #include "cpuFamilyTranslation.h"
 #include "Filecode.h"
 #include "cpuEarlyInit.h"
+#include "cpuFeatures.h"
 CODE_GROUP (G2_PEI)
 RDATA_GROUP (G2_PEI)
 #define FILECODE PROC_CPU_FAMILY_0X16_KB_F16KBINITEARLYTABLE_FILECODE
@@ -88,6 +89,13 @@ GetF16KbEarlyInitAfterApLaunchOnCoreTable (
   IN       AMD_CPU_EARLY_PARAMS                 *EarlyParams,
   IN       AMD_CONFIG_PARAMS                    *StdHeader
   );
+
+VOID
+F16KbLoadMicrocodePatchAtEarly (
+  IN       CPU_SPECIFIC_SERVICES  *FamilyServices,
+  IN       AMD_CPU_EARLY_PARAMS   *EarlyParams,
+  IN       AMD_CONFIG_PARAMS      *StdHeader
+  );
 /*----------------------------------------------------------------------------------------
  *                          E X P O R T E D    F U N C T I O N S
  *----------------------------------------------------------------------------------------
@@ -141,3 +149,27 @@ GetF16KbEarlyInitAfterApLaunchOnCoreTable (
   *Table = F16KbEarlyInitAfterApLaunchOnCoreTable;
 }
 
+/*---------------------------------------------------------------------------------------*/
+/**
+ * Update microcode patch in current processor for Family16h KB.
+ *
+ * This function acts as a wrapper for calling the LoadMicrocodePatch
+ * routine at AmdInitEarly.
+ *
+ *  @param[in]   FamilyServices      The current Family Specific Services.
+ *  @param[in]   EarlyParams         Service parameters.
+ *  @param[in]   StdHeader           Config handle for library and services.
+ *
+ */
+VOID
+F16KbLoadMicrocodePatchAtEarly (
+  IN       CPU_SPECIFIC_SERVICES  *FamilyServices,
+  IN       AMD_CPU_EARLY_PARAMS   *EarlyParams,
+  IN       AMD_CONFIG_PARAMS      *StdHeader
+  )
+{
+  if (!IsFeatureEnabled (C6Cstate, &EarlyParams->PlatformConfig, StdHeader)) {
+    AGESA_TESTPOINT (TpProcCpuLoadUcode, StdHeader);
+    LoadMicrocodePatch (StdHeader);
+  }
+}
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatch0700002A_Enc.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatch0700002A_Enc.c
deleted file mode 100644
index 5a010ae1a4..0000000000
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbMicrocodePatch0700002A_Enc.c
+++ /dev/null
@@ -1,3539 +0,0 @@
-/* $NoKeywords:$ */
-/**
- * @file
- *
- * AMD F16Kb Microcode patch.
- *
- * F16Kb Microcode Patch rev 0700002A for 7000 or equivalent.
- *
- * @xrefitem bom "File Content Label" "Release Content"
- * @e project:      AGESA
- * @e sub-project:  CPU/Family/0x16/KB
- * @e \$Revision: 84798 $   @e \$Date: 2012-12-19 21:26:23 -0600 (Wed, 19 Dec 2012) $
- */
-/*****************************************************************************
- *
- * Copyright (c) 2008 - 2013, Advanced Micro Devices, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Advanced Micro Devices, Inc. nor the names of
- *       its contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL ADVANCED MICRO DEVICES, INC. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ***************************************************************************/
-
-
-
-/*----------------------------------------------------------------------------------------
- *                             M O D U L E S    U S E D
- *----------------------------------------------------------------------------------------
- */
-#include "AGESA.h"
-#include "Ids.h"
-#include "cpuRegisters.h"
-#include "cpuEarlyInit.h"
-CODE_GROUP (G3_DXE)
-RDATA_GROUP (G3_DXE)
-
-/*----------------------------------------------------------------------------------------
- *                   D E F I N I T I O N S    A N D    M A C R O S
- *----------------------------------------------------------------------------------------
- */
-
-/*----------------------------------------------------------------------------------------
- *                  T Y P E D E F S     A N D     S T R U C T U R E S
- *----------------------------------------------------------------------------------------
- */
-
-
-// Encrypt Patch code 0700002A for 7000 and equivalent
-
-CONST UINT8 ROMDATA arr1 [IDS_PAD_4K] =
-{
-  0x12,
-  0x20,
-  0x18,
-  0x12,
-  0x2a,
-  0x00,
-  0x00,
-  0x07,
-  0x03,
-  0x80,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x70,
-  0x00,
-  0x00,
-  0x00,
-  0xaa,
-  0xaa,
-  0xaa,
-  0x49,
-  0x98,
-  0x47,
-  0x92,
-  0x9e,
-  0x94,
-  0x1c,
-  0x90,
-  0x43,
-  0x82,
-  0xfb,
-  0x61,
-  0x5c,
-  0xc3,
-  0x8a,
-  0xb1,
-  0xd7,
-  0x77,
-  0xc5,
-  0x2f,
-  0xe2,
-  0x32,
-  0x8e,
-  0xa2,
-  0xfe,
-  0x17,
-  0x86,
-  0x8b,
-  0xea,
-  0xf8,
-  0x9c,
-  0x9a,
-  0xdb,
-  0x75,
-  0x44,
-  0x1c,
-  0x12,
-  0xd5,
-  0x0f,
-  0x64,
-  0x9f,
-  0x29,
-  0x38,
-  0x9c,
-  0xec,
-  0xfd,
-  0x20,
-  0xb9,
-  0x5c,
-  0x11,
-  0xfa,
-  0xac,
-  0xde,
-  0xa7,
-  0xaf,
-  0xb2,
-  0x71,
-  0x1b,
-  0x5d,
-  0x8d,
-  0x0a,
-  0x84,
-  0xff,
-  0xae,
-  0x77,
-  0xef,
-  0xee,
-  0xe8,
-  0xb9,
-  0xe4,
-  0x4c,
-  0xcf,
-  0x43,
-  0x69,
-  0xda,
-  0x62,
-  0x85,
-  0x56,
-  0x75,
-  0xf4,
-  0xa9,
-  0x9e,
-  0x2a,
-  0x63,
-  0x6d,
-  0xdd,
-  0xcb,
-  0x04,
-  0x18,
-  0xeb,
-  0xa5,
-  0xab,
-  0x8d,
-  0xd7,
-  0x03,
-  0x48,
-  0x71,
-  0x18,
-  0x18,
-  0x3e,
-  0xff,
-  0x33,
-  0x60,
-  0xb0,
-  0x43,
-  0x6c,
-  0xa3,
-  0xc6,
-  0x78,
-  0x0a,
-  0xc8,
-  0x88,
-  0x0b,
-  0x85,
-  0x34,
-  0x41,
-  0x72,
-  0xe7,
-  0x2f,
-  0xac,
-  0x22,
-  0x75,
-  0x9c,
-  0xe3,
-  0x58,
-  0xa0,
-  0xf4,
-  0xa7,
-  0x39,
-  0x42,
-  0x6c,
-  0x39,
-  0xe6,
-  0x8e,
-  0xd2,
-  0xbc,
-  0x6d,
-  0xea,
-  0x84,
-  0xb6,
-  0x83,
-  0xdf,
-  0xfa,
-  0x39,
-  0xf8,
-  0x22,
-  0x55,
-  0xd4,
-  0x69,
-  0x89,
-  0x6a,
-  0xcd,
-  0xb0,
-  0x3d,
-  0xdc,
-  0x2e,
-  0x16,
-  0xcd,
-  0xd6,
-  0xeb,
-  0x66,
-  0x67,
-  0x74,
-  0xc1,
-  0x3c,
-  0x7c,
-  0xed,
-  0xce,
-  0x4c,
-  0x15,
-  0xdf,
-  0x64,
-  0x80,
-  0xbc,
-  0x7f,
-  0xee,
-  0x45,
-  0x2f,
-  0xa2,
-  0x64,
-  0x3b,
-  0xed,
-  0x26,
-  0xdd,
-  0xb5,
-  0xb7,
-  0xef,
-  0xa2,
-  0x7d,
-  0x9b,
-  0x05,
-  0x67,
-  0xbe,
-  0x6e,
-  0xbd,
-  0xb4,
-  0x7d,
-  0x22,
-  0x9f,
-  0xea,
-  0x5b,
-  0xe5,
-  0xf2,
-  0x4b,
-  0x5c,
-  0xfa,
-  0xad,
-  0xcc,
-  0x41,
-  0x10,
-  0x63,
-  0x1a,
-  0xc3,
-  0x7a,
-  0x8a,
-  0x1e,
-  0xc2,
-  0x41,
-  0x3f,
-  0xde,
-  0x82,
-  0x7c,
-  0xa9,
-  0x49,
-  0x43,
-  0xd2,
-  0x05,
-  0x83,
-  0xe6,
-  0x2c,
-  0x3f,
-  0xb1,
-  0x61,
-  0xac,
-  0x78,
-  0x8a,
-  0x03,
-  0xe9,
-  0xda,
-  0x54,
-  0xfd,
-  0x80,
-  0x93,
-  0x32,
-  0x84,
-  0xf6,
-  0xee,
-  0xb1,
-  0x5b,
-  0xa4,
-  0x3e,
-  0x0d,
-  0x7a,
-  0x6a,
-  0x53,
-  0x85,
-  0x61,
-  0x29,
-  0x17,
-  0xb6,
-  0xd3,
-  0xaa,
-  0x02,
-  0x2e,
-  0xef,
-  0x99,
-  0x23,
-  0x88,
-  0x70,
-  0xa8,
-  0xfa,
-  0xbf,
-  0x0a,
-  0xac,
-  0x41,
-  0x1f,
-  0x38,
-  0x03,
-  0x12,
-  0x9f,
-  0x87,
-  0xd8,
-  0x74,
-  0xdb,
-  0xf5,
-  0x51,
-  0x53,
-  0xb0,
-  0x57,
-  0x74,
-  0x1d,
-  0xcd,
-  0x21,
-  0x0e,
-  0xa8,
-  0x0f,
-  0x3e,
-  0x0c,
-  0x40,
-  0x09,
-  0xd2,
-  0x1d,
-  0xd7,
-  0xb1,
-  0x85,
-  0x0d,
-  0x1f,
-  0x47,
-  0x3e,
-  0x59,
-  0x67,
-  0x09,
-  0x95,
-  0xbb,
-  0x05,
-  0x52,
-  0x7f,
-  0xf3,
-  0xc2,
-  0xf5,
-  0x1a,
-  0x80,
-  0x6d,
-  0x31,
-  0x18,
-  0x9d,
-  0xc4,
-  0x47,
-  0xb4,
-  0x5f,
-  0x3c,
-  0xbb,
-  0x20,
-  0x51,
-  0x02,
-  0x5a,
-  0x32,
-  0x13,
-  0x8d,
-  0x25,
-  0x99,
-  0x8d,
-  0xa1,
-  0x87,
-  0x53,
-  0xff,
-  0x0b,
-  0x74,
-  0x68,
-  0x85,
-  0x34,
-  0x3a,
-  0x56,
-  0xfd,
-  0x68,
-  0x0c,
-  0x15,
-  0xd2,
-  0x67,
-  0x4b,
-  0x45,
-  0xa5,
-  0x1b,
-  0x5c,
-  0x5b,
-  0xc9,
-  0x08,
-  0x73,
-  0x99,
-  0xd4,
-  0xbb,
-  0xca,
-  0x5c,
-  0x96,
-  0x39,
-  0x9c,
-  0xbb,
-  0xfe,
-  0x1d,
-  0xff,
-  0x70,
-  0xe1,
-  0xdd,
-  0xfb,
-  0xb7,
-  0x5a,
-  0xce,
-  0x1f,
-  0x16,
-  0xc8,
-  0x2b,
-  0x2d,
-  0xa5,
-  0xdc,
-  0xbf,
-  0x08,
-  0xfe,
-  0x8a,
-  0xf8,
-  0xd6,
-  0xd7,
-  0xf5,
-  0x0e,
-  0x5e,
-  0xcf,
-  0xb1,
-  0x0f,
-  0xf8,
-  0x0c,
-  0x89,
-  0xb4,
-  0x36,
-  0xd3,
-  0x81,
-  0xe4,
-  0xd5,
-  0x16,
-  0x23,
-  0xe3,
-  0x1c,
-  0xb3,
-  0xe1,
-  0x82,
-  0x41,
-  0x81,
-  0xd4,
-  0x6b,
-  0xc2,
-  0x51,
-  0xfb,
-  0x26,
-  0x59,
-  0x9c,
-  0x01,
-  0xc2,
-  0xc7,
-  0xc1,
-  0x60,
-  0xf9,
-  0xe0,
-  0xfc,
-  0x46,
-  0xc0,
-  0xd1,
-  0xf7,
-  0xc7,
-  0xe1,
-  0x44,
-  0x23,
-  0x3c,
-  0x9d,
-  0xec,
-  0xbb,
-  0x6e,
-  0x88,
-  0xae,
-  0x2c,
-  0xec,
-  0xfb,
-  0x5f,
-  0xf4,
-  0x12,
-  0x35,
-  0xff,
-  0x09,
-  0x81,
-  0x66,
-  0x81,
-  0x56,
-  0xcd,
-  0xee,
-  0x62,
-  0x61,
-  0x4d,
-  0xc3,
-  0xb7,
-  0x45,
-  0xa4,
-  0xec,
-  0x07,
-  0xca,
-  0x49,
-  0xce,
-  0x34,
-  0x56,
-  0x33,
-  0xdf,
-  0xaa,
-  0xcb,
-  0xf4,
-  0xf8,
-  0x00,
-  0x29,
-  0x2f,
-  0x30,
-  0xf4,
-  0xb9,
-  0x7a,
-  0x5b,
-  0x1b,
-  0xb5,
-  0xe4,
-  0x14,
-  0x78,
-  0x04,
-  0x04,
-  0xb6,
-  0x51,
-  0xd2,
-  0xf6,
-  0xf1,
-  0xf4,
-  0x09,
-  0xca,
-  0x66,
-  0xe5,
-  0x79,
-  0xda,
-  0xff,
-  0xbd,
-  0x23,
-  0x3e,
-  0xb9,
-  0xcb,
-  0x81,
-  0x4b,
-  0x32,
-  0xff,
-  0x3d,
-  0x64,
-  0x5b,
-  0xf3,
-  0x78,
-  0xe7,
-  0x91,
-  0x40,
-  0x89,
-  0xf4,
-  0xdc,
-  0x50,
-  0xa7,
-  0xd7,
-  0x2c,
-  0xd1,
-  0x93,
-  0x4d,
-  0x7f,
-  0x35,
-  0xa7,
-  0xd1,
-  0xd1,
-  0x17,
-  0x99,
-  0x63,
-  0xae,
-  0x8a,
-  0x4c,
-  0x5a,
-  0x50,
-  0x47,
-  0xa7,
-  0x15,
-  0x5e,
-  0xbc,
-  0x09,
-  0xce,
-  0x7f,
-  0x54,
-  0x70,
-  0xfc,
-  0x22,
-  0xef,
-  0x86,
-  0x57,
-  0xa7,
-  0x68,
-  0x01,
-  0x00,
-  0x00,
-  0x00,
-  0x2a,
-  0x00,
-  0x00,
-  0x07,
-  0x0c,
-  0x1b,
-  0xae,
-  0x1d,
-  0x63,
-  0x04,
-  0x5d,
-  0x04,
-  0x05,
-  0x1a,
-  0xd4,
-  0x06,
-  0xa0,
-  0x0d,
-  0x0e,
-  0x13,
-  0xec,
-  0x0f,
-  0x1b,
-  0x10,
-  0xe7,
-  0x13,
-  0x40,
-  0x1f,
-  0x70,
-  0x10,
-  0x3e,
-  0x11,
-  0xe2,
-  0x13,
-  0x93,
-  0x07,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0xff,
-  0xf7,
-  0x7f,
-  0x22,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x43,
-  0x0c,
-  0xfe,
-  0x00,
-  0xe1,
-  0xcf,
-  0x43,
-  0xd7,
-  0xf1,
-  0xa4,
-  0x06,
-  0x00,
-  0x65,
-  0xd1,
-  0x38,
-  0x80,
-  0xc1,
-  0x1f,
-  0x10,
-  0xe0,
-  0xf7,
-  0xff,
-  0xff,
-  0x80,
-  0xe1,
-  0x1b,
-  0x8a,
-  0xfa,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xff,
-  0xbf,
-  0x2e,
-  0xe0,
-  0x9f,
-  0xab,
-  0xff,
-  0xff,
-  0x7f,
-  0xff,
-  0xff,
-  0xff,
-  0xff,
-  0xcf,
-  0xbf,
-  0xf8,
-  0xb9,
-  0x06,
-  0x00,
-  0x5a,
-  0x5c,
-  0x39,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xdf,
-  0xff,
-  0xff,
-  0x2e,
-  0xe0,
-  0x1f,
-  0xab,
-  0xfa,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x9d,
-  0x4b,
-  0xe1,
-  0x0a,
-  0xa0,
-  0x06,
-  0x00,
-  0x8e,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0xcf,
-  0x43,
-  0xd7,
-  0x70,
-  0x5c,
-  0x39,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xa3,
-  0xdb,
-  0x38,
-  0x00,
-  0xc1,
-  0xdf,
-  0xd9,
-  0xeb,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xda,
-  0xb8,
-  0x06,
-  0x00,
-  0x00,
-  0xff,
-  0xff,
-  0x3c,
-  0xe1,
-  0x5f,
-  0xeb,
-  0xfe,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xdb,
-  0x7a,
-  0x00,
-  0xc0,
-  0x1f,
-  0xdb,
-  0xeb,
-  0xf4,
-  0x01,
-  0x39,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0x4d,
-  0xa0,
-  0x06,
-  0x00,
-  0x5b,
-  0xd4,
-  0x38,
-  0x00,
-  0x80,
-  0x1f,
-  0xc0,
-  0xff,
-  0x9f,
-  0xfa,
-  0xff,
-  0xac,
-  0xe1,
-  0x1f,
-  0xeb,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf8,
-  0xff,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xeb,
-  0xfe,
-  0xe2,
-  0xff,
-  0xff,
-  0x2e,
-  0xe1,
-  0x9f,
-  0xab,
-  0xfa,
-  0x27,
-  0xb9,
-  0x06,
-  0x00,
-  0x0d,
-  0xdd,
-  0x38,
-  0xc0,
-  0xa1,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x26,
-  0xb9,
-  0x06,
-  0x00,
-  0xfd,
-  0xff,
-  0xff,
-  0x2c,
-  0xe0,
-  0x9f,
-  0x6b,
-  0xf1,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xf3,
-  0xb8,
-  0x06,
-  0x00,
-  0xf0,
-  0x58,
-  0x39,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xf0,
-  0x5c,
-  0x39,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x43,
-  0xdc,
-  0x38,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0x3f,
-  0xdc,
-  0x38,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0x1f,
-  0xa3,
-  0x06,
-  0x00,
-  0xff,
-  0x7f,
-  0xff,
-  0x2e,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x8d,
-  0xdf,
-  0x38,
-  0x00,
-  0xc1,
-  0x1f,
-  0x10,
-  0xe0,
-  0xff,
-  0xbd,
-  0x07,
-  0x00,
-  0x38,
-  0xdd,
-  0x38,
-  0xc0,
-  0xa1,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xb1,
-  0xfe,
-  0x38,
-  0xc0,
-  0xa1,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xe6,
-  0x2f,
-  0x06,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x56,
-  0x5f,
-  0x06,
-  0x00,
-  0xf8,
-  0xff,
-  0xff,
-  0x2d,
-  0xe1,
-  0x5f,
-  0xeb,
-  0xfe,
-  0xf0,
-  0xff,
-  0xff,
-  0x2e,
-  0xe1,
-  0x9f,
-  0xeb,
-  0xfe,
-  0x56,
-  0xb8,
-  0x06,
-  0x00,
-  0xff,
-  0xdd,
-  0x7f,
-  0x00,
-  0xe1,
-  0x5d,
-  0x8b,
-  0xfe,
-  0xff,
-  0xdb,
-  0x7f,
-  0x2e,
-  0xe1,
-  0x8f,
-  0x6b,
-  0xcb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x67,
-  0xd9,
-  0x3a,
-  0x00,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x42,
-  0xa0,
-  0x06,
-  0x00,
-  0x9d,
-  0xf1,
-  0xef,
-  0x2b,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xe0,
-  0xff,
-  0xff,
-  0x2f,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xac,
-  0xdf,
-  0xfb,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x2c,
-  0xa0,
-  0x06,
-  0x00,
-  0xf7,
-  0x63,
-  0x3f,
-  0x00,
-  0xc0,
-  0x9f,
-  0xd9,
-  0xeb,
-  0xef,
-  0x61,
-  0x3f,
-  0x00,
-  0xc0,
-  0x9f,
-  0xd9,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd7,
-  0x7a,
-  0x00,
-  0xc0,
-  0xdf,
-  0xda,
-  0xeb,
-  0xe7,
-  0xff,
-  0xff,
-  0x00,
-  0xe0,
-  0xdd,
-  0x0a,
-  0xf9,
-  0x81,
-  0xaf,
-  0x06,
-  0x00,
-  0xef,
-  0x56,
-  0x39,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0xdf,
-  0xff,
-  0xff,
-  0x2f,
-  0xe0,
-  0xdf,
-  0xab,
-  0xfa,
-  0x80,
-  0xaf,
-  0x06,
-  0x00,
-  0x7f,
-  0xfd,
-  0x38,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0x67,
-  0xf9,
-  0x38,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0x0d,
-  0xa0,
-  0x06,
-  0x00,
-  0x77,
-  0xd5,
-  0x38,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0xd9,
-  0x7f,
-  0x3f,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x6f,
-  0xd7,
-  0x3a,
-  0x00,
-  0xc0,
-  0x9f,
-  0xdb,
-  0xeb,
-  0xff,
-  0x57,
-  0x7f,
-  0x29,
-  0xa0,
-  0x9f,
-  0xc9,
-  0xe7,
-  0x0c,
-  0xa0,
-  0x06,
-  0x00,
-  0x67,
-  0xd9,
-  0x3a,
-  0x00,
-  0xc0,
-  0x9f,
-  0xdb,
-  0xeb,
-  0xc0,
-  0xff,
-  0xff,
-  0x28,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xac,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf9,
-  0xff,
-  0xff,
-  0x2d,
-  0xe1,
-  0x9f,
-  0xaf,
-  0xfe,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x6b,
-  0xb8,
-  0x06,
-  0x00,
-  0xf5,
-  0xff,
-  0xff,
-  0x28,
-  0xe1,
-  0x9f,
-  0xaf,
-  0xfe,
-  0x90,
-  0xff,
-  0xff,
-  0x29,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x0b,
-  0xd0,
-  0x38,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0x7b,
-  0xfa,
-  0xff,
-  0xa8,
-  0xe1,
-  0x1f,
-  0xea,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xdb,
-  0x7a,
-  0x00,
-  0xc1,
-  0x1f,
-  0x1a,
-  0xe0,
-  0x00,
-  0xff,
-  0xff,
-  0x2d,
-  0xe1,
-  0x5b,
-  0xeb,
-  0xfe,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x07,
-  0xd0,
-  0x38,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0x6f,
-  0xfc,
-  0xff,
-  0xa8,
-  0xe1,
-  0x1f,
-  0xea,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd9,
-  0x7a,
-  0x00,
-  0xc1,
-  0x1f,
-  0x1a,
-  0xe0,
-  0xff,
-  0xff,
-  0xff,
-  0xac,
-  0xe1,
-  0x1f,
-  0xeb,
-  0xe1,
-  0x5b,
-  0x92,
-  0x06,
-  0x00,
-  0xff,
-  0xd9,
-  0x7f,
-  0x2d,
-  0xe1,
-  0x5f,
-  0xab,
-  0xfe,
-  0xa1,
-  0xdb,
-  0x38,
-  0x00,
-  0xa1,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf9,
-  0xff,
-  0xff,
-  0x2f,
-  0xe1,
-  0xdf,
-  0xab,
-  0xfa,
-  0xfc,
-  0xff,
-  0xff,
-  0x2f,
-  0xe1,
-  0xdf,
-  0xeb,
-  0xfe,
-  0x1e,
-  0xa0,
-  0x06,
-  0x00,
-  0xfe,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0xdb,
-  0x8b,
-  0xfe,
-  0xff,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0xd7,
-  0xc3,
-  0xd6,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xfb,
-  0xff,
-  0x26,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xa3,
-  0xdf,
-  0x38,
-  0x00,
-  0xc1,
-  0x9f,
-  0xd9,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xe7,
-  0xff,
-  0xff,
-  0x2f,
-  0xe1,
-  0xdf,
-  0xeb,
-  0xfa,
-  0xf7,
-  0xff,
-  0xff,
-  0x2f,
-  0xe1,
-  0xdf,
-  0xeb,
-  0xff,
-  0x1e,
-  0xa0,
-  0x06,
-  0x00,
-  0xef,
-  0xdf,
-  0x3a,
-  0x00,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd5,
-  0x7a,
-  0x00,
-  0xc1,
-  0x1f,
-  0xdb,
-  0xeb,
-  0x81,
-  0xff,
-  0xff,
-  0x2c,
-  0xe1,
-  0x9f,
-  0xea,
-  0xfe,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf7,
-  0xff,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xeb,
-  0xff,
-  0xf8,
-  0xff,
-  0xff,
-  0x2a,
-  0xe1,
-  0x9f,
-  0xaa,
-  0xfa,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xfe,
-  0xff,
-  0xff,
-  0x2a,
-  0xe1,
-  0x9f,
-  0xea,
-  0xfe,
-  0xff,
-  0xd5,
-  0x7f,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xab,
-  0xfa,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe0,
-  0x1f,
-  0x4b,
-  0xe6,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe0,
-  0xdf,
-  0x79,
-  0xe4,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xab,
-  0xdb,
-  0x38,
-  0x00,
-  0xc0,
-  0x5f,
-  0x9a,
-  0xfc,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe2,
-  0xff,
-  0xcf,
-  0x7f,
-  0x27,
-  0xe0,
-  0x5f,
-  0x6b,
-  0xe3,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xdc,
-  0xff,
-  0xff,
-  0x27,
-  0xe0,
-  0xdd,
-  0xa9,
-  0xfa,
-  0xe2,
-  0xff,
-  0xff,
-  0x2a,
-  0xe0,
-  0x9f,
-  0xea,
-  0xfa,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd5,
-  0x7f,
-  0x2c,
-  0xe0,
-  0xcf,
-  0x69,
-  0xff,
-  0x4f,
-  0xd8,
-  0x38,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x2e,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe2,
-  0xff,
-  0xd9,
-  0x7f,
-  0x2c,
-  0xe0,
-  0x9f,
-  0x6b,
-  0xe3,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xdf,
-  0xff,
-  0xff,
-  0x2c,
-  0xe0,
-  0x1d,
-  0xab,
-  0xfa,
-  0xdf,
-  0xff,
-  0xff,
-  0x2e,
-  0xe0,
-  0x9f,
-  0xeb,
-  0xfa,
-  0xef,
-  0xa5,
-  0x06,
-  0x00,
-  0xff,
-  0xdd,
-  0x7f,
-  0x2c,
-  0xe0,
-  0x0f,
-  0x6b,
-  0xff,
-  0x2b,
-  0xce,
-  0x38,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0x94,
-  0xbb,
-  0x06,
-  0x00,
-  0xdf,
-  0xfb,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xdf,
-  0x7a,
-  0x2c,
-  0xc0,
-  0x9f,
-  0xdb,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf7,
-  0x5f,
-  0x3f,
-  0x00,
-  0xa0,
-  0x9f,
-  0xc9,
-  0xe7,
-  0xf7,
-  0xdf,
-  0x3a,
-  0x2c,
-  0xc0,
-  0x9f,
-  0xdb,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xef,
-  0x5f,
-  0x3f,
-  0x00,
-  0xa0,
-  0x9f,
-  0xc9,
-  0xe7,
-  0x2f,
-  0xcc,
-  0x38,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xf7,
-  0xdf,
-  0x3a,
-  0x2c,
-  0xc0,
-  0x9f,
-  0xdb,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0xdd,
-  0x0b,
-  0xf9,
-  0xfe,
-  0xff,
-  0xff,
-  0x2d,
-  0xe1,
-  0x4b,
-  0x6b,
-  0xcb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x5b,
-  0x7f,
-  0x00,
-  0xa0,
-  0x9f,
-  0xc9,
-  0xe7,
-  0xe7,
-  0xff,
-  0xff,
-  0x26,
-  0xe0,
-  0x9f,
-  0xe9,
-  0xff,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf3,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0xd7,
-  0xc3,
-  0xd6,
-  0x7f,
-  0x5e,
-  0x3f,
-  0x00,
-  0xa0,
-  0x9f,
-  0xc9,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xff,
-  0xbf,
-  0x2d,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x0f,
-  0xff,
-  0xfe,
-  0xff,
-  0xff,
-  0xff,
-  0xcf,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xdb,
-  0x7f,
-  0x2d,
-  0xe0,
-  0xdf,
-  0x6b,
-  0xf1,
-  0xcc,
-  0xff,
-  0xff,
-  0x2b,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xac,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xe0,
-  0xff,
-  0xff,
-  0x28,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xac,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd7,
-  0x7f,
-  0x2d,
-  0xe0,
-  0x5f,
-  0xab,
-  0xff,
-  0xf7,
-  0xdb,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd1,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x00,
-  0x00,
-  0xfe,
-  0x2b,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x00,
-  0x00,
-  0xfe,
-  0x2d,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x49,
-  0x9d,
-  0x06,
-  0x00,
-  0x00,
-  0x00,
-  0xbf,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x00,
-  0x80,
-  0xff,
-  0x7f,
-  0x80,
-  0x3e,
-  0xce,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xdf,
-  0xbf,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0x5d,
-  0xff,
-  0xff,
-  0xff,
-  0xff,
-  0xcf,
-  0xbf,
-  0x49,
-  0x3d,
-  0x06,
-  0x00,
-  0xb0,
-  0xff,
-  0xff,
-  0x2b,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xc0,
-  0xff,
-  0xff,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xac,
-  0x49,
-  0x3d,
-  0x06,
-  0x00,
-  0x2f,
-  0xd4,
-  0x38,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0x67,
-  0x5e,
-  0x3f,
-  0x00,
-  0xc0,
-  0x9f,
-  0xda,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xdf,
-  0xfb,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xf7,
-  0xdf,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd1,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x2f,
-  0xd4,
-  0x38,
-  0x00,
-  0xc0,
-  0x1f,
-  0xd0,
-  0xeb,
-  0xf7,
-  0x5f,
-  0x3f,
-  0x00,
-  0xc0,
-  0x9f,
-  0xda,
-  0xeb,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xef,
-  0x5b,
-  0x3f,
-  0x00,
-  0xc0,
-  0x9f,
-  0xda,
-  0xeb,
-  0x00,
-  0xff,
-  0xff,
-  0x2f,
-  0xe1,
-  0xdf,
-  0xeb,
-  0xfe,
-  0x48,
-  0xba,
-  0x06,
-  0x00,
-  0xff,
-  0xdf,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xf7,
-  0xdb,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0x47,
-  0xba,
-  0x06,
-  0x00,
-  0xe7,
-  0xff,
-  0xff,
-  0x26,
-  0xe0,
-  0x9f,
-  0xe9,
-  0xff,
-  0xf4,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0xcf,
-  0x03,
-  0xd7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf7,
-  0x81,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xdf,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x2b,
-  0xe0,
-  0xdf,
-  0xeb,
-  0xf3,
-  0x00,
-  0x00,
-  0xfe,
-  0x2d,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x49,
-  0x9d,
-  0x06,
-  0x00,
-  0x00,
-  0x00,
-  0xbf,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x00,
-  0x80,
-  0xff,
-  0x7f,
-  0x80,
-  0x3e,
-  0xce,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xdf,
-  0xbf,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0x5d,
-  0xff,
-  0xff,
-  0xff,
-  0xff,
-  0xcf,
-  0xbf,
-  0x49,
-  0x3d,
-  0x06,
-  0x00,
-  0xb0,
-  0xff,
-  0xff,
-  0x2b,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xc0,
-  0xff,
-  0xff,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xac,
-  0x49,
-  0x3d,
-  0x06,
-  0x00,
-  0xcc,
-  0xff,
-  0xff,
-  0x2d,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xac,
-  0xff,
-  0xe5,
-  0x7f,
-  0x2a,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x67,
-  0x5e,
-  0x3f,
-  0x00,
-  0xc0,
-  0x9f,
-  0xda,
-  0xeb,
-  0xff,
-  0xdb,
-  0x7f,
-  0x2d,
-  0xe0,
-  0xdf,
-  0xab,
-  0xff,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xfe,
-  0xff,
-  0xff,
-  0x2a,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xd5,
-  0x7f,
-  0x2d,
-  0xe0,
-  0x5f,
-  0x6b,
-  0xf1,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xdf,
-  0xfb,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xe0,
-  0xff,
-  0xff,
-  0x29,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xac,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf7,
-  0xdb,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xd3,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xf7,
-  0xdf,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xd3,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x00,
-  0xff,
-  0xff,
-  0x31,
-  0xe1,
-  0x5f,
-  0xec,
-  0xfe,
-  0xff,
-  0xe3,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xc3,
-  0xb2,
-  0x06,
-  0x00,
-  0xf7,
-  0xe1,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xc2,
-  0xb2,
-  0x06,
-  0x00,
-  0x0a,
-  0x02,
-  0xff,
-  0x2e,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x7f,
-  0xfd,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xfa,
-  0x3a,
-  0x06,
-  0x00,
-  0x39,
-  0x1f,
-  0xfe,
-  0x00,
-  0xe1,
-  0xcf,
-  0x03,
-  0xd7,
-  0xe7,
-  0xff,
-  0xff,
-  0x2e,
-  0xe0,
-  0x9f,
-  0xeb,
-  0xfa,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xee,
-  0xff,
-  0xff,
-  0x2d,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xac,
-  0xff,
-  0xdb,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x2b,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x2d,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x11,
-  0x20,
-  0x06,
-  0x00,
-  0x17,
-  0xfc,
-  0xbf,
-  0x2d,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xff,
-  0xff,
-  0xff,
-  0xff,
-  0xff,
-  0xcf,
-  0xbf,
-  0x11,
-  0x80,
-  0x06,
-  0x00,
-  0xfc,
-  0xff,
-  0xff,
-  0x2b,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xe3,
-  0xff,
-  0xff,
-  0x2b,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xee,
-  0xff,
-  0xff,
-  0x2d,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x11,
-  0x20,
-  0x06,
-  0x00,
-  0xff,
-  0xff,
-  0xbf,
-  0x2d,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xff,
-  0xef,
-  0xff,
-  0xaa,
-  0xff,
-  0xcf,
-  0xbf,
-  0x11,
-  0x80,
-  0x06,
-  0x00,
-  0xf1,
-  0xff,
-  0xff,
-  0x2b,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xff,
-  0xbf,
-  0x2d,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xff,
-  0x9f,
-  0xef,
-  0xd5,
-  0xfe,
-  0xcf,
-  0xbf,
-  0x11,
-  0x80,
-  0x06,
-  0x00,
-  0xf0,
-  0xff,
-  0xff,
-  0x2b,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x2b,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xfe,
-  0xff,
-  0xff,
-  0x2d,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0x11,
-  0x20,
-  0x06,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x56,
-  0x5f,
-  0x06,
-  0x00,
-  0x0a,
-  0x02,
-  0xff,
-  0x2e,
-  0xe0,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xe7,
-  0xff,
-  0xff,
-  0x2e,
-  0xe0,
-  0x9f,
-  0xeb,
-  0xfa,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xe0,
-  0xff,
-  0xff,
-  0x29,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xac,
-  0xdf,
-  0xfb,
-  0xff,
-  0x2c,
-  0xe1,
-  0x1f,
-  0xe0,
-  0xe7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd7,
-  0x7f,
-  0x2b,
-  0xe1,
-  0x5f,
-  0xaa,
-  0xff,
-  0xf7,
-  0xdb,
-  0x3a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xfb,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0xd7,
-  0x7a,
-  0x2c,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xdb,
-  0xf7,
-  0xff,
-  0x3e,
-  0xe0,
-  0x1f,
-  0x2b,
-  0xfb,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xe6,
-  0x58,
-  0x06,
-  0x00,
-  0xff,
-  0xd1,
-  0x7f,
-  0x28,
-  0xe0,
-  0x1f,
-  0x6b,
-  0xf1,
-  0x67,
-  0xd1,
-  0x3a,
-  0x00,
-  0xa0,
-  0x9f,
-  0xcb,
-  0xe7,
-  0x46,
-  0xa1,
-  0x06,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x45,
-  0xa1,
-  0x06,
-  0x00,
-  0xf8,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0x9d,
-  0x0b,
-  0xf9,
-  0xfe,
-  0xff,
-  0xff,
-  0x00,
-  0xe1,
-  0xcf,
-  0x43,
-  0xd7,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0x2b,
-  0xce,
-  0x38,
-  0x00,
-  0xa0,
-  0x1f,
-  0xc0,
-  0xe7,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x97,
-  0x5b,
-  0x02,
-  0x00,
-  0x57,
-  0xdc,
-  0x38,
-  0x00,
-  0xc0,
-  0xdf,
-  0xdb,
-  0xeb,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0x9b,
-  0x5b,
-  0x06,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0x81,
-  0x7f,
-  0x00,
-  0xe1,
-  0x1f,
-  0xc0,
-  0xbf,
-  0xff,
-  0xbf,
-  0x07,
-  0x00,
-  0xbc,
-  0xa8,
-  0x3e,
-  0x11,
-  0x69,
-  0xce,
-  0x06,
-  0x3f,
-  0xb9,
-  0x87,
-  0xd7,
-  0xdd,
-  0xc6,
-  0x12,
-  0xb6,
-  0xe2,
-  0xc2,
-  0x53,
-  0x20,
-  0xfb,
-  0xea,
-  0x71,
-  0x72,
-  0xb5,
-  0xe1,
-  0xa6,
-  0xd8,
-  0xee,
-  0x9d,
-  0x97,
-  0xe6,
-  0x72,
-  0x3f,
-  0x73,
-  0x88,
-  0xed,
-  0x14,
-  0x8c,
-  0xdf,
-  0x5d,
-  0x8f,
-  0x0d,
-  0xd0,
-  0x70,
-  0x64,
-  0x1c,
-  0x06,
-  0x7f,
-  0x59,
-  0x93,
-  0x32,
-  0x55,
-  0x2a,
-  0x10,
-  0x61,
-  0xde,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-  0x00,
-};
-
-/*----------------------------------------------------------------------------------------
- *           P R O T O T Y P E S     O F     L O C A L     F U N C T I O N S
- *----------------------------------------------------------------------------------------
- */
-
-/*----------------------------------------------------------------------------------------
- *                          E X P O R T E D    F U N C T I O N S
- *----------------------------------------------------------------------------------------
- */
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c
index 4cd445e349..253d518d52 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbPciTables.c
@@ -710,23 +710,6 @@ STATIC CONST TABLE_ENTRY_FIELDS ROMDATA F16KbPciRegistersAfterApLaunch[] =
       0x08000000,                           // RegMask
     }}
   },
-// D18F3x200 - Performance Mode Control Register
-// bits[3]       EnMcqPrbPickThrottle = 0x1
-// bits[2]       EnDctOddToNcLnkDatXfr = 0x1
-// bits[1]       EnDctEvnToNcLnkDatXfr = 0x1
-  {
-    PciRegister,
-    {
-      AMD_FAMILY_16,                        // CpuFamily
-      AMD_F16_KB_ALL                        // CpuRevision
-    },
-    {AMD_PF_ALL},                           // PlatformFeatures
-    {{
-      MAKE_SBDFO (0, 0, 24, FUNC_3, 0x200), // Address
-      0x0000000E,                           // RegData
-      0x0000000E,                           // RegMask
-    }}
-  },
 // D18F4x118 - C-state Control 1
 // bits[23:21]   ClkDivisorCstAct1   = 0x0
 // bits[19:18]   CacheFlushTmrSelCstAct1 = 0x2
@@ -828,7 +811,7 @@ STATIC CONST TABLE_ENTRY_FIELDS ROMDATA F16KbPciRegistersAfterApLaunch[] =
     }}
   },
 // D18F5x8C
-// bits[15]                          = 0x1
+// bits[15]      EnSrqAllocGt31      = 0x1
   {
     PciRegister,
     {