blaze: update EMC BCT table

This change updated the EMC tables with emc_reg_tool 5.0.18,
for below memory SKUs:

- Hynix H5TC4G63AFR-PBR 2GB, ramcode = 0
- Micron MT41K256M16HA-125 2GB, ramcode = 1
- Samsung K4B4G1646Q-HYK0 2GB, ramcode = 2
- Hynix H5TC8G63AFR-PBR 4GB, ramcode = 8
- Micron MT41K512M16TNA-125 4GB, ramcode = 9
- Samsung K4B8G1646Q-MYKO 4GB, ramcode = 10

BUG=chrome-os-partner:30963
BRANCH=blaze
TEST=emerged coreboot, booted successfully into kernel.

Change-Id: Iee329ff09e35cddd3c868c0460a38ef56b2ac5bb
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 158872ff7c0dd5274cfa8d63ec17b4423a4592ce
Original-Change-Id: I44adfdb5b433e37e2d25095acdcce3d9c14eb897
Original-Signed-off-by: Neil Chen <neilc@nvidia.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/210024
Original-Tested-by: Ken Chang <kenc@nvidia.com>
Original-Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Original-Reviewed-by: Tom Warren <twarren@nvidia.com>
Reviewed-on: http://review.coreboot.org/9116
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

6 files changed, 72 insertions, 72 deletions

diff --git a/src/mainboard/google/nyan_blaze/bct/sdram-hynix-2GB-792.inc b/src/mainboard/google/nyan_blaze/bct/sdram-hynix-2GB-792.inc
index ec0b7f16db..3d79a5efd3 100644
--- a/src/mainboard/google/nyan_blaze/bct/sdram-hynix-2GB-792.inc
+++ b/src/mainboard/google/nyan_blaze/bct/sdram-hynix-2GB-792.inc
@@ -1,4 +1,4 @@
-{ /* generated from Hynix_2GB_H5TC4G63AFR_PBA_792MHz_0318_Modify.cfg; do not edit. */
+{ /* generated from Hynix_2GB_H5TC4G63AFR_PBA_792MHz_0703_PVT_Modify.cfg; do not edit. */
   .MemoryType                               = NvBootMemoryType_Ddr3,
   .PllMInputDivider                         = 0x00000001,
   .PllMFeedbackDivider                      = 0x00000042,
@@ -241,15 +241,15 @@
   .EmcXm2VttGenPadCtrl3                     = 0x016eeeee,
   .EmcAcpdControl                           = 0x00000000,
   .EmcSwizzleRank0ByteCfg                   = 0x00003120,
-  .EmcSwizzleRank0Byte0                     = 0x25143067,
-  .EmcSwizzleRank0Byte1                     = 0x45367102,
-  .EmcSwizzleRank0Byte2                     = 0x47106253,
-  .EmcSwizzleRank0Byte3                     = 0x04362175,
+  .EmcSwizzleRank0Byte0                     = 0x01643752,
+  .EmcSwizzleRank0Byte1                     = 0x34675021,
+  .EmcSwizzleRank0Byte2                     = 0x63170254,
+  .EmcSwizzleRank0Byte3                     = 0x14065327,
   .EmcSwizzleRank1ByteCfg                   = 0x00003120,
-  .EmcSwizzleRank1Byte0                     = 0x71546032,
-  .EmcSwizzleRank1Byte1                     = 0x35104276,
-  .EmcSwizzleRank1Byte2                     = 0x27043615,
-  .EmcSwizzleRank1Byte3                     = 0x72306145,
+  .EmcSwizzleRank1Byte0                     = 0x73541062,
+  .EmcSwizzleRank1Byte1                     = 0x10637254,
+  .EmcSwizzleRank1Byte2                     = 0x62043715,
+  .EmcSwizzleRank1Byte3                     = 0x73015624,
   .EmcDsrVttgenDrv                          = 0x0606003f,
   .EmcTxdsrvttgen                           = 0x00000000,
   .EmcBgbiasCtl0                            = 0x00000000,
@@ -301,7 +301,7 @@
   .EmcCaTrainingEnable                      = 0x00000000,
   .EmcCaTrainingTimingCntl1                 = 0x1f7df7df,
   .EmcCaTrainingTimingCntl2                 = 0x0000001f,
-  .SwizzleRankByteEncode                    = 0x0000006f,
+  .SwizzleRankByteEncode                    = 0x0000000b,
   .BootRomPatchControl                      = 0x00000000,
   .BootRomPatchData                         = 0x00000000,
   .McMtsCarveoutBom                         = 0xfff00000,
diff --git a/src/mainboard/google/nyan_blaze/bct/sdram-hynix-4GB-792.inc b/src/mainboard/google/nyan_blaze/bct/sdram-hynix-4GB-792.inc
index 6afd3b75b2..057d93b4fc 100644
--- a/src/mainboard/google/nyan_blaze/bct/sdram-hynix-4GB-792.inc
+++ b/src/mainboard/google/nyan_blaze/bct/sdram-hynix-4GB-792.inc
@@ -1,4 +1,4 @@
-{ /* generated from Hynix_4GB_H5TC8G63AFR_PBA_792MHz_release.cfg; do not edit. */
+{ /* generated from Hynix_4GB_H5TC8G63AFR_PBA_792MHz_0714.cfg; do not edit. */
   .MemoryType                               = NvBootMemoryType_Ddr3,
   .PllMInputDivider                         = 0x00000001,
   .PllMFeedbackDivider                      = 0x00000042,
@@ -24,7 +24,7 @@
   .EmcBctSpare11                            = 0x00000000,
   .EmcClockSource                           = 0x80000000,
   .EmcAutoCalInterval                       = 0x001fffff,
-  .EmcAutoCalConfig                         = 0xa1430404,
+  .EmcAutoCalConfig                         = 0xa1430808,
   .EmcAutoCalConfig2                        = 0x00000000,
   .EmcAutoCalConfig3                        = 0x00000000,
   .EmcAutoCalWait                           = 0x00000190,
@@ -123,18 +123,18 @@
   .EmcDllXformDqs1                          = 0x00000008,
   .EmcDllXformDqs2                          = 0x00000008,
   .EmcDllXformDqs3                          = 0x00000008,
-  .EmcDllXformDqs4                          = 0x00000006,
-  .EmcDllXformDqs5                          = 0x00000006,
+  .EmcDllXformDqs4                          = 0x00008004,
+  .EmcDllXformDqs5                          = 0x00004006,
   .EmcDllXformDqs6                          = 0x00000006,
-  .EmcDllXformDqs7                          = 0x007F8008,
+  .EmcDllXformDqs7                          = 0x00008004,
   .EmcDllXformDqs8                          = 0x00000008,
   .EmcDllXformDqs9                          = 0x00000008,
   .EmcDllXformDqs10                         = 0x00000008,
   .EmcDllXformDqs11                         = 0x00000008,
-  .EmcDllXformDqs12                         = 0x00000006,
-  .EmcDllXformDqs13                         = 0x00000006,
+  .EmcDllXformDqs12                         = 0x00008004,
+  .EmcDllXformDqs13                         = 0x00004006,
   .EmcDllXformDqs14                         = 0x00000006,
-  .EmcDllXformDqs15                         = 0x007F8008,
+  .EmcDllXformDqs15                         = 0x00008004,
   .EmcDllXformQUse0                         = 0x00000000,
   .EmcDllXformQUse1                         = 0x00000000,
   .EmcDllXformQUse2                         = 0x00000000,
@@ -229,7 +229,7 @@
   .EmcXm2DqsPadCtrl3                        = 0x69A69A20,
   .EmcXm2DqsPadCtrl4                        = 0x00514514,
   .EmcXm2DqsPadCtrl5                        = 0x00514510,
-  .EmcXm2DqsPadCtrl6                        = 0x69A69A00,
+  .EmcXm2DqsPadCtrl6                        = 0x69865A00,
   .EmcXm2DqPadCtrl                          = 0x770c2990,
   .EmcXm2DqPadCtrl2                         = 0x00000000,
   .EmcXm2DqPadCtrl3                         = 0x00000000,
diff --git a/src/mainboard/google/nyan_blaze/bct/sdram-micron-2GB-792.inc b/src/mainboard/google/nyan_blaze/bct/sdram-micron-2GB-792.inc
index 1b52f0c16d..c24242ef0c 100644
--- a/src/mainboard/google/nyan_blaze/bct/sdram-micron-2GB-792.inc
+++ b/src/mainboard/google/nyan_blaze/bct/sdram-micron-2GB-792.inc
@@ -1,4 +1,4 @@
-{ /* generated from Micron_2GB_MT41K256M16HA_792MHz_0408.cfg; do not edit. */
+{ /* generated from Micron_2GB_MT41K256M16HA_792MHz_0623.cfg; do not edit. */
   .MemoryType                               = NvBootMemoryType_Ddr3,
   .PllMInputDivider                         = 0x00000001,
   .PllMFeedbackDivider                      = 0x00000042,
@@ -241,15 +241,15 @@
   .EmcXm2VttGenPadCtrl3                     = 0x016eeeee,
   .EmcAcpdControl                           = 0x00000000,
   .EmcSwizzleRank0ByteCfg                   = 0x00003120,
-  .EmcSwizzleRank0Byte0                     = 0x25143067,
-  .EmcSwizzleRank0Byte1                     = 0x45367102,
-  .EmcSwizzleRank0Byte2                     = 0x47106253,
-  .EmcSwizzleRank0Byte3                     = 0x04362175,
+  .EmcSwizzleRank0Byte0                     = 0x01643752,
+  .EmcSwizzleRank0Byte1                     = 0x34675021,
+  .EmcSwizzleRank0Byte2                     = 0x63170254,
+  .EmcSwizzleRank0Byte3                     = 0x14065327,
   .EmcSwizzleRank1ByteCfg                   = 0x00003120,
-  .EmcSwizzleRank1Byte0                     = 0x71546032,
-  .EmcSwizzleRank1Byte1                     = 0x35104276,
-  .EmcSwizzleRank1Byte2                     = 0x27043615,
-  .EmcSwizzleRank1Byte3                     = 0x72306145,
+  .EmcSwizzleRank1Byte0                     = 0x73541062,
+  .EmcSwizzleRank1Byte1                     = 0x10637254,
+  .EmcSwizzleRank1Byte2                     = 0x62043715,
+  .EmcSwizzleRank1Byte3                     = 0x73015624,
   .EmcDsrVttgenDrv                          = 0x0606003f,
   .EmcTxdsrvttgen                           = 0x00000000,
   .EmcBgbiasCtl0                            = 0x00000000,
@@ -301,7 +301,7 @@
   .EmcCaTrainingEnable                      = 0x00000000,
   .EmcCaTrainingTimingCntl1                 = 0x1f7df7df,
   .EmcCaTrainingTimingCntl2                 = 0x0000001f,
-  .SwizzleRankByteEncode                    = 0x0000006f,
+  .SwizzleRankByteEncode                    = 0x0000000b,
   .BootRomPatchControl                      = 0x00000000,
   .BootRomPatchData                         = 0x00000000,
   .McMtsCarveoutBom                         = 0xfff00000,
diff --git a/src/mainboard/google/nyan_blaze/bct/sdram-micron-4GB-792.inc b/src/mainboard/google/nyan_blaze/bct/sdram-micron-4GB-792.inc
index 5a7b6bea1c..e8726534c8 100644
--- a/src/mainboard/google/nyan_blaze/bct/sdram-micron-4GB-792.inc
+++ b/src/mainboard/google/nyan_blaze/bct/sdram-micron-4GB-792.inc
@@ -1,4 +1,4 @@
-{ /* generated from Micron_4GB_MT41K512M16TNA-125_792MHz.cfg; do not edit. */
+{ /* generated from Micron_4GB_MT41K512M16TNA-125_792MHz_0707.cfg; do not edit. */
   .MemoryType                               = NvBootMemoryType_Ddr3,
   .PllMInputDivider                         = 0x00000001,
   .PllMFeedbackDivider                      = 0x00000042,
@@ -120,7 +120,7 @@
   .EmcDevSelect                             = 0x00000000,
   .EmcSelDpdCtrl                            = 0x00040000,
   .EmcDllXformDqs0                          = 0x00000008,
-  .EmcDllXformDqs1                          = 0x00000008,
+  .EmcDllXformDqs1                          = 0x00004008,
   .EmcDllXformDqs2                          = 0x00000008,
   .EmcDllXformDqs3                          = 0x00000008,
   .EmcDllXformDqs4                          = 0x00000008,
@@ -174,12 +174,12 @@
   .EmcDliTrimTxDqs14                        = 0x0000000a,
   .EmcDliTrimTxDqs15                        = 0x0000000a,
   .EmcDllXformDq0                           = 0x0000000e,
-  .EmcDllXformDq1                           = 0x0000000e,
+  .EmcDllXformDq1                           = 0x007F800E,
   .EmcDllXformDq2                           = 0x0000000e,
   .EmcDllXformDq3                           = 0x0000000e,
   .EmcDllXformDq4                           = 0x0000000e,
   .EmcDllXformDq5                           = 0x0000000e,
-  .EmcDllXformDq6                           = 0x0000000e,
+  .EmcDllXformDq6                           = 0x0007F80E,
   .EmcDllXformDq7                           = 0x0000000e,
   .WarmBootWait                             = 0x00000002,
   .EmcCttTermCtrl                           = 0x00000802,
@@ -227,8 +227,8 @@
   .EmcXm2DqsPadCtrl                         = 0x770c1414,
   .EmcXm2DqsPadCtrl2                        = 0x0120113d,
   .EmcXm2DqsPadCtrl3                        = 0x61861820,
-  .EmcXm2DqsPadCtrl4                        = 0x00514514,
-  .EmcXm2DqsPadCtrl5                        = 0x00514514,
+  .EmcXm2DqsPadCtrl4                        = 0x00555555,
+  .EmcXm2DqsPadCtrl5                        = 0x00555555,
   .EmcXm2DqsPadCtrl6                        = 0x61861800,
   .EmcXm2DqPadCtrl                          = 0x770c2990,
   .EmcXm2DqPadCtrl2                         = 0x00000000,
diff --git a/src/mainboard/google/nyan_blaze/bct/sdram-samsung-2GB-792.inc b/src/mainboard/google/nyan_blaze/bct/sdram-samsung-2GB-792.inc
index a1728f2270..9d180cc9f1 100644
--- a/src/mainboard/google/nyan_blaze/bct/sdram-samsung-2GB-792.inc
+++ b/src/mainboard/google/nyan_blaze/bct/sdram-samsung-2GB-792.inc
@@ -1,4 +1,4 @@
-{ /* generated from Samsung_2GB_K4B4G1646Q_HYK0_792MHz_0502.cfg; do not edit. */
+{ /* generated from Samsung_2GB_K4B4G1646Q_HYK0_792MHz_0623_merged.cfg; do not edit. */
   .MemoryType                               = NvBootMemoryType_Ddr3,
   .PllMInputDivider                         = 0x00000001,
   .PllMFeedbackDivider                      = 0x00000042,
@@ -241,15 +241,15 @@
   .EmcXm2VttGenPadCtrl3                     = 0x016eeeee,
   .EmcAcpdControl                           = 0x00000000,
   .EmcSwizzleRank0ByteCfg                   = 0x00003120,
-  .EmcSwizzleRank0Byte0                     = 0x25143067,
-  .EmcSwizzleRank0Byte1                     = 0x45367102,
-  .EmcSwizzleRank0Byte2                     = 0x47106253,
-  .EmcSwizzleRank0Byte3                     = 0x04362175,
+  .EmcSwizzleRank0Byte0                     = 0x01643752,
+  .EmcSwizzleRank0Byte1                     = 0x34675021,
+  .EmcSwizzleRank0Byte2                     = 0x63170254,
+  .EmcSwizzleRank0Byte3                     = 0x14065327,
   .EmcSwizzleRank1ByteCfg                   = 0x00003120,
-  .EmcSwizzleRank1Byte0                     = 0x71546032,
-  .EmcSwizzleRank1Byte1                     = 0x35104276,
-  .EmcSwizzleRank1Byte2                     = 0x27043615,
-  .EmcSwizzleRank1Byte3                     = 0x72306145,
+  .EmcSwizzleRank1Byte0                     = 0x73541062,
+  .EmcSwizzleRank1Byte1                     = 0x10637254,
+  .EmcSwizzleRank1Byte2                     = 0x62043715,
+  .EmcSwizzleRank1Byte3                     = 0x73015624,
   .EmcDsrVttgenDrv                          = 0x0606003f,
   .EmcTxdsrvttgen                           = 0x00000000,
   .EmcBgbiasCtl0                            = 0x00000000,
@@ -301,7 +301,7 @@
   .EmcCaTrainingEnable                      = 0x00000000,
   .EmcCaTrainingTimingCntl1                 = 0x1f7df7df,
   .EmcCaTrainingTimingCntl2                 = 0x0000001f,
-  .SwizzleRankByteEncode                    = 0x0000006f,
+  .SwizzleRankByteEncode                    = 0x0000000b,
   .BootRomPatchControl                      = 0x00000000,
   .BootRomPatchData                         = 0x00000000,
   .McMtsCarveoutBom                         = 0xfff00000,
diff --git a/src/mainboard/google/nyan_blaze/bct/sdram-samsung-4GB-792.inc b/src/mainboard/google/nyan_blaze/bct/sdram-samsung-4GB-792.inc
index f8c3a5f99f..a66857075d 100644
--- a/src/mainboard/google/nyan_blaze/bct/sdram-samsung-4GB-792.inc
+++ b/src/mainboard/google/nyan_blaze/bct/sdram-samsung-4GB-792.inc
@@ -1,4 +1,4 @@
-{ /* generated from Samsung_4GB_K4B8G1646Q_792MHz_release.cfg; do not edit. */
+{ /* generated from Samsung_4GB_K4B8G1646Q_792MHz_0703.cfg; do not edit. */
   .MemoryType                               = NvBootMemoryType_Ddr3,
   .PllMInputDivider                         = 0x00000001,
   .PllMFeedbackDivider                      = 0x00000042,
@@ -24,7 +24,7 @@
   .EmcBctSpare11                            = 0x00000000,
   .EmcClockSource                           = 0x80000000,
   .EmcAutoCalInterval                       = 0x001fffff,
-  .EmcAutoCalConfig                         = 0xa1430707,
+  .EmcAutoCalConfig                         = 0xa1430F0F,
   .EmcAutoCalConfig2                        = 0x00000000,
   .EmcAutoCalConfig3                        = 0x00000000,
   .EmcAutoCalWait                           = 0x00000190,
@@ -120,21 +120,21 @@
   .EmcDevSelect                             = 0x00000000,
   .EmcSelDpdCtrl                            = 0x00040000,
   .EmcDllXformDqs0                          = 0x00000009,
-  .EmcDllXformDqs1                          = 0x0000000a,
-  .EmcDllXformDqs2                          = 0x00000009,
-  .EmcDllXformDqs3                          = 0x0000000a,
-  .EmcDllXformDqs4                          = 0x0000000b,
-  .EmcDllXformDqs5                          = 0x0000000a,
-  .EmcDllXformDqs6                          = 0x0000000b,
-  .EmcDllXformDqs7                          = 0x00000008,
+  .EmcDllXformDqs1                          = 0x00000009,
+  .EmcDllXformDqs2                          = 0x00008004,
+  .EmcDllXformDqs3                          = 0x00000009,
+  .EmcDllXformDqs4                          = 0x00000009,
+  .EmcDllXformDqs5                          = 0x007f400c,
+  .EmcDllXformDqs6                          = 0x007f800b,
+  .EmcDllXformDqs7                          = 0x00000007,
   .EmcDllXformDqs8                          = 0x00000009,
-  .EmcDllXformDqs9                          = 0x0000000a,
-  .EmcDllXformDqs10                         = 0x00000009,
-  .EmcDllXformDqs11                         = 0x0000000a,
-  .EmcDllXformDqs12                         = 0x0000000b,
-  .EmcDllXformDqs13                         = 0x0000000a,
-  .EmcDllXformDqs14                         = 0x0000000b,
-  .EmcDllXformDqs15                         = 0x00000008,
+  .EmcDllXformDqs9                          = 0x00000009,
+  .EmcDllXformDqs10                         = 0x00008004,
+  .EmcDllXformDqs11                         = 0x00000009,
+  .EmcDllXformDqs12                         = 0x00000009,
+  .EmcDllXformDqs13                         = 0x007f400c,
+  .EmcDllXformDqs14                         = 0x007f800b,
+  .EmcDllXformDqs15                         = 0x00000007,
   .EmcDllXformQUse0                         = 0x00000000,
   .EmcDllXformQUse1                         = 0x00000000,
   .EmcDllXformQUse2                         = 0x00000000,
@@ -159,20 +159,20 @@
   .EmcDllXformQUse15                        = 0x00000000,
   .EmcDliTrimTxDqs0                         = 0x00000008,
   .EmcDliTrimTxDqs1                         = 0x00000008,
-  .EmcDliTrimTxDqs2                         = 0x00000005,
+  .EmcDliTrimTxDqs2                         = 0x00000008,
   .EmcDliTrimTxDqs3                         = 0x00000008,
-  .EmcDliTrimTxDqs4                         = 0x0000000a,
+  .EmcDliTrimTxDqs4                         = 0x00000008,
   .EmcDliTrimTxDqs5                         = 0x00000008,
-  .EmcDliTrimTxDqs6                         = 0x0000000a,
-  .EmcDliTrimTxDqs7                         = 0x0000000a,
+  .EmcDliTrimTxDqs6                         = 0x00000008,
+  .EmcDliTrimTxDqs7                         = 0x00000008,
   .EmcDliTrimTxDqs8                         = 0x00000008,
   .EmcDliTrimTxDqs9                         = 0x00000008,
-  .EmcDliTrimTxDqs10                        = 0x00000005,
+  .EmcDliTrimTxDqs10                        = 0x00000008,
   .EmcDliTrimTxDqs11                        = 0x00000008,
-  .EmcDliTrimTxDqs12                        = 0x0000000a,
+  .EmcDliTrimTxDqs12                        = 0x00000008,
   .EmcDliTrimTxDqs13                        = 0x00000008,
-  .EmcDliTrimTxDqs14                        = 0x0000000a,
-  .EmcDliTrimTxDqs15                        = 0x0000000a,
+  .EmcDliTrimTxDqs14                        = 0x00000008,
+  .EmcDliTrimTxDqs15                        = 0x00000008,
   .EmcDllXformDq0                           = 0x0000000c,
   .EmcDllXformDq1                           = 0x0000000c,
   .EmcDllXformDq2                           = 0x0000000c,
@@ -226,10 +226,10 @@
   .EmcXm2CmdPadCtrl5                        = 0x00111111,
   .EmcXm2DqsPadCtrl                         = 0x770c1414,
   .EmcXm2DqsPadCtrl2                        = 0x0120113d,
-  .EmcXm2DqsPadCtrl3                        = 0x61869a20,
+  .EmcXm2DqsPadCtrl3                        = 0x69a69c20,
   .EmcXm2DqsPadCtrl4                        = 0x00596596,
-  .EmcXm2DqsPadCtrl5                        = 0x00596596,
-  .EmcXm2DqsPadCtrl6                        = 0x69969900,
+  .EmcXm2DqsPadCtrl5                        = 0x00618618,
+  .EmcXm2DqsPadCtrl6                        = 0x69969a00,
   .EmcXm2DqPadCtrl                          = 0x770c2990,
   .EmcXm2DqPadCtrl2                         = 0x00000000,
   .EmcXm2DqPadCtrl3                         = 0x00000000,