summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNeil Chen <neilc@nvidia.com>2014-04-09 10:52:45 +0800
committerMarc Jones <marc.jones@se-eng.com>2014-12-15 20:12:02 +0100
commit1e68fc5c70b83357b30f45107170811dd8ed03a6 (patch)
treeb3ea9a04c4179b53aa6e7364d8f22138618f07bd /src
parent83cbeda88dbfdd9717cf8124cc863abffb5f516b (diff)
downloadcoreboot-1e68fc5c70b83357b30f45107170811dd8ed03a6.tar.xz
blaze: Change RAMCODE 0010 to hynix-2GB-792MHz
RAM module for RAMCODE 0010 (K4B4G1646Q) does not work with hynix-2GB-204MHz configuration. We need to replace it by hynix-2GB-792MHz. Also updated hynix-2GB-792MHz configuration from Nyan board folder. This commit is only for bring up stage. Once finish dram stress test, will update it again. BRANCH=none BUG=chrome-os-partner:27682 TEST=emerge-nyan_blaze coreboot builds OK; flash to blaze board and boot to kernel successfully Original-Change-Id: Idfc503c944ac6120c92a4cf329f3fbe63b2c2a1c Original-Signed-off-by: Neil Chen <neilc@nvidia.com> Original-Reviewed-on: https://chromium-review.googlesource.com/193737 Original-Reviewed-by: Hung-Te Lin <hungte@chromium.org> (cherry picked from commit 91f21aa0cf9251b825e42d946d8cd41849c57447) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I6293fa638c5b2577e502ba34a3cc6e6d5b7f2fdb Reviewed-on: http://review.coreboot.org/7742 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/google/nyan_blaze/bct/sdram-hynix-2GB-792.inc128
-rw-r--r--src/mainboard/google/nyan_blaze/sdram_configs.c2
2 files changed, 65 insertions, 65 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 3020002603..d175e7b4e4 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
@@ -33,18 +33,18 @@
.EmcPinExtraWait = 0x00000000,
.EmcTimingControlWait = 0x00000000,
.EmcRc = 0x00000025,
- .EmcRfc = 0x000000cc,
+ .EmcRfc = 0x000000cd,
.EmcRfcSlr = 0x00000000,
- .EmcRas = 0x0000001a,
- .EmcRp = 0x00000009,
+ .EmcRas = 0x00000019,
+ .EmcRp = 0x0000000a,
.EmcR2r = 0x00000000,
.EmcW2w = 0x00000000,
- .EmcR2w = 0x00000008,
+ .EmcR2w = 0x00000007,
.EmcW2r = 0x0000000d,
.EmcR2p = 0x00000004,
.EmcW2p = 0x00000013,
- .EmcRdRcd = 0x00000009,
- .EmcWrRcd = 0x00000009,
+ .EmcRdRcd = 0x0000000a,
+ .EmcWrRcd = 0x0000000a,
.EmcRrd = 0x00000003,
.EmcRext = 0x00000002,
.EmcWext = 0x00000000,
@@ -53,31 +53,31 @@
.EmcQUse = 0x0000000b,
.EmcQuseWidth = 0x00000002,
.EmcIbdly = 0x00000000,
- .EmcEInput = 0x00000002,
- .EmcEInputDuration = 0x0000000d,
- .EmcPutermExtra = 0x00080000,
+ .EmcEInput = 0x00000003,
+ .EmcEInputDuration = 0x0000000c,
+ .EmcPutermExtra = 0x00090000,
.EmcPutermWidth = 0x00000004,
.EmcPutermAdj = 0x00000000,
.EmcCdbCntl1 = 0x00000000,
.EmcCdbCntl2 = 0x00000000,
.EmcCdbCntl3 = 0x00000000,
- .EmcQRst = 0x00000001,
- .EmcQSafe = 0x00000014,
- .EmcRdv = 0x00000018,
- .EmcRdvMask = 0x0000001a,
+ .EmcQRst = 0x00000002,
+ .EmcQSafe = 0x00000011,
+ .EmcRdv = 0x00000017,
+ .EmcRdvMask = 0x00000019,
.EmcQpop = 0x0000000f,
.EmcCtt = 0x00000000,
.EmcCttDuration = 0x00000004,
- .EmcRefresh = 0x000017e2,
+ .EmcRefresh = 0x000017eb,
.EmcBurstRefreshNum = 0x00000000,
- .EmcPreRefreshReqCnt = 0x000005f8,
+ .EmcPreRefreshReqCnt = 0x000005fa,
.EmcPdEx2Wr = 0x00000003,
- .EmcPdEx2Rd = 0x00000011,
+ .EmcPdEx2Rd = 0x00000003,
.EmcPChg2Pden = 0x00000001,
.EmcAct2Pden = 0x00000000,
- .EmcAr2Pden = 0x000000c6,
+ .EmcAr2Pden = 0x000000c7,
.EmcRw2Pden = 0x00000018,
- .EmcTxsr = 0x000000d6,
+ .EmcTxsr = 0x000000d7,
.EmcTxsrDll = 0x00000200,
.EmcTcke = 0x00000005,
.EmcTckesr = 0x00000006,
@@ -86,12 +86,12 @@
.EmcTrpab = 0x00000000,
.EmcTClkStable = 0x00000008,
.EmcTClkStop = 0x00000008,
- .EmcTRefBw = 0x00001822,
- .EmcFbioCfg5 = 0x104ab098,
- .EmcFbioCfg6 = 0x00000000,
+ .EmcTRefBw = 0x0000182c,
+ .EmcFbioCfg5 = 0x104ab898,
+ .EmcFbioCfg6 = 0x00000002,
.EmcFbioSpare = 0x00000000,
.EmcCfgRsv = 0xff00ff00,
- .EmcMrs = 0x80000d71,
+ .EmcMrs = 0x80001d71,
.EmcEmrs = 0x80100002,
.EmcEmrs2 = 0x80200018,
.EmcEmrs3 = 0x80300000,
@@ -105,17 +105,17 @@
.EmcExtraModeRegWriteEnable = 0x00000000,
.EmcMrwResetCommand = 0x00000000,
.EmcMrwResetNInitWait = 0x00000000,
- .EmcMrsWaitCnt = 0x00f8000c,
- .EmcMrsWaitCnt2 = 0x00f8000c,
+ .EmcMrsWaitCnt = 0x00f7000e,
+ .EmcMrsWaitCnt2 = 0x00f7000e,
.EmcCfg = 0x73300000,
.EmcCfg2 = 0x0000089d,
- .EmcCfgPipe = 0x00004080,
+ .EmcCfgPipe = 0x000040a0,
.EmcDbg = 0x01000c00,
.EmcCmdQ = 0x10004408,
.EmcMc2EmcQ = 0x06000404,
- .EmcDynSelfRefControl = 0x80003012,
+ .EmcDynSelfRefControl = 0x80003025,
.AhbArbitrationXbarCtrlMemInitDone = 0x00000001,
- .EmcCfgDigDll = 0xe00700b1,
+ .EmcCfgDigDll = 0xe00701b1,
.EmcCfgDigDllPeriod = 0x00008000,
.EmcDevSelect = 0x00000002,
.EmcSelDpdCtrl = 0x00040000,
@@ -143,11 +143,11 @@
.EmcDllXformQUse5 = 0x00000000,
.EmcDllXformQUse6 = 0x00000000,
.EmcDllXformQUse7 = 0x00000000,
- .EmcDllXformAddr0 = 0x00034000,
- .EmcDllXformAddr1 = 0x00034000,
+ .EmcDllXformAddr0 = 0x0000000e,
+ .EmcDllXformAddr1 = 0x0000000e,
.EmcDllXformAddr2 = 0x00000000,
- .EmcDllXformAddr3 = 0x00034000,
- .EmcDllXformAddr4 = 0x00034000,
+ .EmcDllXformAddr3 = 0x0000000e,
+ .EmcDllXformAddr4 = 0x00000000,
.EmcDllXformAddr5 = 0x00000000,
.EmcDllXformQUse8 = 0x00000000,
.EmcDllXformQUse9 = 0x00000000,
@@ -157,30 +157,30 @@
.EmcDllXformQUse13 = 0x00000000,
.EmcDllXformQUse14 = 0x00000000,
.EmcDllXformQUse15 = 0x00000000,
- .EmcDliTrimTxDqs0 = 0x00000008,
- .EmcDliTrimTxDqs1 = 0x00000008,
- .EmcDliTrimTxDqs2 = 0x00000005,
- .EmcDliTrimTxDqs3 = 0x00000009,
- .EmcDliTrimTxDqs4 = 0x00000009,
- .EmcDliTrimTxDqs5 = 0x00000007,
- .EmcDliTrimTxDqs6 = 0x00000009,
- .EmcDliTrimTxDqs7 = 0x00000008,
- .EmcDliTrimTxDqs8 = 0x00000008,
- .EmcDliTrimTxDqs9 = 0x00000008,
- .EmcDliTrimTxDqs10 = 0x00000005,
- .EmcDliTrimTxDqs11 = 0x00000009,
- .EmcDliTrimTxDqs12 = 0x00000009,
- .EmcDliTrimTxDqs13 = 0x00000007,
- .EmcDliTrimTxDqs14 = 0x00000009,
- .EmcDliTrimTxDqs15 = 0x00000008,
- .EmcDllXformDq0 = 0x0000000e,
- .EmcDllXformDq1 = 0x0000000e,
- .EmcDllXformDq2 = 0x0000000e,
- .EmcDllXformDq3 = 0x0000000e,
- .EmcDllXformDq4 = 0x0000000e,
- .EmcDllXformDq5 = 0x0000000e,
- .EmcDllXformDq6 = 0x0000000e,
- .EmcDllXformDq7 = 0x0000000e,
+ .EmcDliTrimTxDqs0 = 0x00000000,
+ .EmcDliTrimTxDqs1 = 0x00000000,
+ .EmcDliTrimTxDqs2 = 0x00000000,
+ .EmcDliTrimTxDqs3 = 0x00000000,
+ .EmcDliTrimTxDqs4 = 0x00000000,
+ .EmcDliTrimTxDqs5 = 0x00000000,
+ .EmcDliTrimTxDqs6 = 0x00000000,
+ .EmcDliTrimTxDqs7 = 0x00000000,
+ .EmcDliTrimTxDqs8 = 0x00000000,
+ .EmcDliTrimTxDqs9 = 0x00000000,
+ .EmcDliTrimTxDqs10 = 0x00000000,
+ .EmcDliTrimTxDqs11 = 0x00000000,
+ .EmcDliTrimTxDqs12 = 0x00000000,
+ .EmcDliTrimTxDqs13 = 0x00000000,
+ .EmcDliTrimTxDqs14 = 0x00000000,
+ .EmcDliTrimTxDqs15 = 0x00000000,
+ .EmcDllXformDq0 = 0x0000000b,
+ .EmcDllXformDq1 = 0x0000000b,
+ .EmcDllXformDq2 = 0x0000000b,
+ .EmcDllXformDq3 = 0x0000000b,
+ .EmcDllXformDq4 = 0x0000000b,
+ .EmcDllXformDq5 = 0x0000000b,
+ .EmcDllXformDq6 = 0x0000000b,
+ .EmcDllXformDq7 = 0x0000000b,
.WarmBootWait = 0x00000002,
.EmcCttTermCtrl = 0x00000802,
.EmcOdtWrite = 0x00000000,
@@ -198,7 +198,7 @@
.EmcZcalWarmBootWait = 0x00000001,
.EmcMrsWarmBootEnable = 0x00000001,
.EmcMrsResetDllWait = 0x00000000,
- .EmcMrsExtra = 0x80000d71,
+ .EmcMrsExtra = 0x80001d71,
.EmcWarmBootMrsExtra = 0x80100002,
.EmcEmrsDdr2DllEnable = 0x00000000,
.EmcMrsDdr2DllReset = 0x00000000,
@@ -225,7 +225,7 @@
.EmcXm2CmdPadCtrl4 = 0x00000000,
.EmcXm2CmdPadCtrl5 = 0x00111111,
.EmcXm2DqsPadCtrl = 0x770c1414,
- .EmcXm2DqsPadCtrl2 = 0x0120113d,
+ .EmcXm2DqsPadCtrl2 = 0x0020013d,
.EmcXm2DqsPadCtrl3 = 0x61861820,
.EmcXm2DqsPadCtrl4 = 0x00514514,
.EmcXm2DqsPadCtrl5 = 0x00514514,
@@ -234,11 +234,11 @@
.EmcXm2DqPadCtrl2 = 0x00000000,
.EmcXm2DqPadCtrl3 = 0x00000000,
.EmcXm2ClkPadCtrl = 0x77ffc085,
- .EmcXm2ClkPadCtrl2 = 0x00000101,
+ .EmcXm2ClkPadCtrl2 = 0x00000707,
.EmcXm2CompPadCtrl = 0x81f1f108,
.EmcXm2VttGenPadCtrl = 0x07070004,
.EmcXm2VttGenPadCtrl2 = 0x00000000,
- .EmcXm2VttGenPadCtrl3 = 0x016eeeee,
+ .EmcXm2VttGenPadCtrl3 = 0x017fffff,
.EmcAcpdControl = 0x00000000,
.EmcSwizzleRank0ByteCfg = 0x00003120,
.EmcSwizzleRank0Byte0 = 0x25143067,
@@ -250,7 +250,7 @@
.EmcSwizzleRank1Byte1 = 0x35104276,
.EmcSwizzleRank1Byte2 = 0x27043615,
.EmcSwizzleRank1Byte3 = 0x72306145,
- .EmcDsrVttgenDrv = 0x0606003f,
+ .EmcDsrVttgenDrv = 0x0505003f,
.EmcTxdsrvttgen = 0x00000000,
.EmcBgbiasCtl0 = 0x00000000,
.McEmemAdrCfg = 0x00000000,
@@ -273,11 +273,11 @@
.McEmemArbTimingWap2Pre = 0x0000000c,
.McEmemArbTimingR2R = 0x00000002,
.McEmemArbTimingW2W = 0x00000002,
- .McEmemArbTimingR2W = 0x00000006,
+ .McEmemArbTimingR2W = 0x00000005,
.McEmemArbTimingW2R = 0x00000008,
- .McEmemArbDaTurns = 0x08060202,
- .McEmemArbDaCovers = 0x00160d13,
- .McEmemArbMisc0 = 0x734c2414,
+ .McEmemArbDaTurns = 0x08050202,
+ .McEmemArbDaCovers = 0x00170e13,
+ .McEmemArbMisc0 = 0x736c2414,
.McEmemArbMisc1 = 0x70000f02,
.McEmemArbRing1Throttle = 0x001f0000,
.McEmemArbOverride = 0x10000000,
diff --git a/src/mainboard/google/nyan_blaze/sdram_configs.c b/src/mainboard/google/nyan_blaze/sdram_configs.c
index c5a8082d3d..d369d17d59 100644
--- a/src/mainboard/google/nyan_blaze/sdram_configs.c
+++ b/src/mainboard/google/nyan_blaze/sdram_configs.c
@@ -24,7 +24,7 @@
static struct sdram_params sdram_configs[] = {
#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 0000 */
#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 0001 */
-#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 0010 */
+#include "bct/sdram-hynix-2GB-792.inc" /* ram_code = 0010 */
#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 0011 */
#include "bct/sdram-unused.inc" /* ram_code = 0100 */
#include "bct/sdram-unused.inc" /* ram_code = 0101 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 07:20:58 +0000