summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2014-03-03 13:16:35 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-11-13 06:24:42 +0100
commit6940c0da9bab9c0842228053767ac97316dd7c53 (patch)
treef735c4656a2da71a8fcadc26a04123e810b99ff9
parentb9a4b713f88c111628d3b35d8a695de88ff39ecd (diff)
nyan: Update 924MHz BCT w/latest qual'd cfg, use 924 as default speed for 2GB
BUG=none BRANCH=nyan TEST=built and booted coreboot on my Nyan-rev1, browsed, ran Youtube vids, WebGL experiments, etc. Everything seemed OK. Original-Change-Id: I877680c9329ed96a0b602f0690acaa12079786d7 Original-Signed-off-by: Tom Warren <twarren@nvidia.com> Original-Reviewed-on: https://chromium-review.googlesource.com/188550 Original-Reviewed-by: Julius Werner <jwerner@chromium.org> (cherry picked from commit b6ca59e9db26f7422fa43ade889c921257a36851) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: If166938f241e2a4a8670bfce2df6591b4b71ff67 Reviewed-on: http://review.coreboot.org/7408 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org>
Diffstat
-rw-r--r--src/mainboard/google/nyan/bct/sdram-hynix-2GB-924.inc120
-rw-r--r--src/mainboard/google/nyan/sdram_configs.c2
2 files changed, 61 insertions, 61 deletions
diff --git a/src/mainboard/google/nyan/bct/sdram-hynix-2GB-924.inc b/src/mainboard/google/nyan/bct/sdram-hynix-2GB-924.inc
index e4d4faf24a..b10a696447 100644
--- a/src/mainboard/google/nyan/bct/sdram-hynix-2GB-924.inc
+++ b/src/mainboard/google/nyan/bct/sdram-hynix-2GB-924.inc
@@ -1,4 +1,4 @@
-{ /* generated from sdram-0001-924-2GB.cfg; do not edit. */
+{ /* generated from sdram-hynix-2GB-924.cfg; do not edit. */
.MemoryType = NvBootMemoryType_Ddr3,
.PllMInputDivider = 0x00000001,
.PllMFeedbackDivider = 0x0000004d,
@@ -24,7 +24,7 @@
.EmcBctSpare11 = 0x00000000,
.EmcClockSource = 0x80000000,
.EmcAutoCalInterval = 0x001fffff,
- .EmcAutoCalConfig = 0xa1430404,
+ .EmcAutoCalConfig = 0xa1430101,
.EmcAutoCalConfig2 = 0x00000000,
.EmcAutoCalConfig3 = 0x00000000,
.EmcAutoCalWait = 0x00000190,
@@ -33,13 +33,13 @@
.EmcPinExtraWait = 0x00000000,
.EmcTimingControlWait = 0x00000000,
.EmcRc = 0x0000002b,
- .EmcRfc = 0x000000ef,
+ .EmcRfc = 0x000000f0,
.EmcRfcSlr = 0x00000000,
.EmcRas = 0x0000001e,
.EmcRp = 0x0000000b,
.EmcR2r = 0x00000000,
.EmcW2w = 0x00000000,
- .EmcR2w = 0x00000008,
+ .EmcR2w = 0x0000000a,
.EmcW2r = 0x0000000f,
.EmcR2p = 0x00000005,
.EmcW2p = 0x00000016,
@@ -48,13 +48,13 @@
.EmcRrd = 0x00000004,
.EmcRext = 0x00000002,
.EmcWext = 0x00000000,
- .EmcWdv = 0x00000006,
- .EmcWdvMask = 0x00000006,
- .EmcQUse = 0x0000000c,
+ .EmcWdv = 0x00000007,
+ .EmcWdvMask = 0x00000007,
+ .EmcQUse = 0x0000000d,
.EmcQuseWidth = 0x00000002,
.EmcIbdly = 0x00000000,
.EmcEInput = 0x00000002,
- .EmcEInputDuration = 0x0000000e,
+ .EmcEInputDuration = 0x0000000f,
.EmcPutermExtra = 0x000a0000,
.EmcPutermWidth = 0x00000004,
.EmcPutermAdj = 0x00000000,
@@ -62,22 +62,22 @@
.EmcCdbCntl2 = 0x00000000,
.EmcCdbCntl3 = 0x00000000,
.EmcQRst = 0x00000001,
- .EmcQSafe = 0x00000015,
- .EmcRdv = 0x0000001b,
- .EmcRdvMask = 0x0000001d,
- .EmcQpop = 0x00000010,
+ .EmcQSafe = 0x00000016,
+ .EmcRdv = 0x0000001a,
+ .EmcRdvMask = 0x0000001c,
+ .EmcQpop = 0x00000011,
.EmcCtt = 0x00000000,
.EmcCttDuration = 0x00000004,
- .EmcRefresh = 0x00001be9,
+ .EmcRefresh = 0x00001be7,
.EmcBurstRefreshNum = 0x00000000,
- .EmcPreRefreshReqCnt = 0x000006fa,
+ .EmcPreRefreshReqCnt = 0x000006f9,
.EmcPdEx2Wr = 0x00000004,
.EmcPdEx2Rd = 0x00000015,
.EmcPChg2Pden = 0x00000001,
.EmcAct2Pden = 0x00000000,
- .EmcAr2Pden = 0x000000e6,
+ .EmcAr2Pden = 0x000000e7,
.EmcRw2Pden = 0x0000001b,
- .EmcTxsr = 0x000000fa,
+ .EmcTxsr = 0x000000fb,
.EmcTxsrDll = 0x00000200,
.EmcTcke = 0x00000006,
.EmcTckesr = 0x00000007,
@@ -86,9 +86,9 @@
.EmcTrpab = 0x00000000,
.EmcTClkStable = 0x0000000a,
.EmcTClkStop = 0x0000000a,
- .EmcTRefBw = 0x00001c29,
+ .EmcTRefBw = 0x00001c28,
.EmcFbioCfg5 = 0x104ab898,
- .EmcFbioCfg6 = 0x00000002,
+ .EmcFbioCfg6 = 0x00000000,
.EmcFbioSpare = 0x00000000,
.EmcCfgRsv = 0xff00ff00,
.EmcMrs = 0x80000f15,
@@ -105,36 +105,36 @@
.EmcExtraModeRegWriteEnable = 0x00000000,
.EmcMrwResetCommand = 0x00000000,
.EmcMrwResetNInitWait = 0x00000000,
- .EmcMrsWaitCnt = 0x00ce000e,
- .EmcMrsWaitCnt2 = 0x00ce000e,
+ .EmcMrsWaitCnt = 0x00cd000e,
+ .EmcMrsWaitCnt2 = 0x00cd000e,
.EmcCfg = 0x73300000,
- .EmcCfg2 = 0x000008a5,
- .EmcCfgPipe = 0x00000000,
+ .EmcCfg2 = 0x0000089d,
+ .EmcCfgPipe = 0x00004080,
.EmcDbg = 0x01000c00,
.EmcCmdQ = 0x10004408,
.EmcMc2EmcQ = 0x06000404,
- .EmcDynSelfRefControl = 0x800037ed,
+ .EmcDynSelfRefControl = 0x800037ea,
.AhbArbitrationXbarCtrlMemInitDone = 0x00000001,
- .EmcCfgDigDll = 0xe00401b1,
+ .EmcCfgDigDll = 0xe00400b1,
.EmcCfgDigDllPeriod = 0x00008000,
.EmcDevSelect = 0x00000002,
.EmcSelDpdCtrl = 0x00040000,
- .EmcDllXformDqs0 = 0x00000005,
- .EmcDllXformDqs1 = 0x00000005,
- .EmcDllXformDqs2 = 0x00000005,
- .EmcDllXformDqs3 = 0x00000005,
- .EmcDllXformDqs4 = 0x00000005,
- .EmcDllXformDqs5 = 0x00000005,
- .EmcDllXformDqs6 = 0x00000005,
- .EmcDllXformDqs7 = 0x00000005,
- .EmcDllXformDqs8 = 0x00000005,
- .EmcDllXformDqs9 = 0x00000005,
- .EmcDllXformDqs10 = 0x00000005,
- .EmcDllXformDqs11 = 0x00000005,
- .EmcDllXformDqs12 = 0x00000005,
- .EmcDllXformDqs13 = 0x00000005,
- .EmcDllXformDqs14 = 0x00000005,
- .EmcDllXformDqs15 = 0x00000005,
+ .EmcDllXformDqs0 = 0x007fc005,
+ .EmcDllXformDqs1 = 0x007fc005,
+ .EmcDllXformDqs2 = 0x007f8008,
+ .EmcDllXformDqs3 = 0x007f8008,
+ .EmcDllXformDqs4 = 0x007fc005,
+ .EmcDllXformDqs5 = 0x007f8008,
+ .EmcDllXformDqs6 = 0x007fc005,
+ .EmcDllXformDqs7 = 0x007fc005,
+ .EmcDllXformDqs8 = 0x007fc005,
+ .EmcDllXformDqs9 = 0x007fc005,
+ .EmcDllXformDqs10 = 0x007f8008,
+ .EmcDllXformDqs11 = 0x007f8008,
+ .EmcDllXformDqs12 = 0x007fc005,
+ .EmcDllXformDqs13 = 0x007f8008,
+ .EmcDllXformDqs14 = 0x007fc005,
+ .EmcDllXformDqs15 = 0x007fc005,
.EmcDllXformQUse0 = 0x00000000,
.EmcDllXformQUse1 = 0x00000000,
.EmcDllXformQUse2 = 0x00000000,
@@ -143,11 +143,11 @@
.EmcDllXformQUse5 = 0x00000000,
.EmcDllXformQUse6 = 0x00000000,
.EmcDllXformQUse7 = 0x00000000,
- .EmcDllXformAddr0 = 0x0000400e,
- .EmcDllXformAddr1 = 0x0000400e,
+ .EmcDllXformAddr0 = 0x00018000,
+ .EmcDllXformAddr1 = 0x00018000,
.EmcDllXformAddr2 = 0x00000000,
- .EmcDllXformAddr3 = 0x0000400e,
- .EmcDllXformAddr4 = 0x0000400e,
+ .EmcDllXformAddr3 = 0x00018000,
+ .EmcDllXformAddr4 = 0x00018000,
.EmcDllXformAddr5 = 0x00000000,
.EmcDllXformQUse8 = 0x00000000,
.EmcDllXformQUse9 = 0x00000000,
@@ -173,14 +173,14 @@
.EmcDliTrimTxDqs13 = 0x00000000,
.EmcDliTrimTxDqs14 = 0x00000000,
.EmcDliTrimTxDqs15 = 0x00000000,
- .EmcDllXformDq0 = 0x00000006,
- .EmcDllXformDq1 = 0x00000006,
- .EmcDllXformDq2 = 0x00000006,
- .EmcDllXformDq3 = 0x00000006,
- .EmcDllXformDq4 = 0x00000006,
- .EmcDllXformDq5 = 0x00000006,
- .EmcDllXformDq6 = 0x00000006,
- .EmcDllXformDq7 = 0x00000006,
+ .EmcDllXformDq0 = 0x00000007,
+ .EmcDllXformDq1 = 0x00000007,
+ .EmcDllXformDq2 = 0x00000007,
+ .EmcDllXformDq3 = 0x00000007,
+ .EmcDllXformDq4 = 0x00000007,
+ .EmcDllXformDq5 = 0x00000007,
+ .EmcDllXformDq6 = 0x00000007,
+ .EmcDllXformDq7 = 0x00000007,
.WarmBootWait = 0x00000002,
.EmcCttTermCtrl = 0x00000802,
.EmcOdtWrite = 0x00000000,
@@ -225,16 +225,16 @@
.EmcXm2CmdPadCtrl4 = 0x00000000,
.EmcXm2CmdPadCtrl5 = 0x00111111,
.EmcXm2DqsPadCtrl = 0x770c1414,
- .EmcXm2DqsPadCtrl2 = 0x0020013d,
- .EmcXm2DqsPadCtrl3 = 0x55555520,
- .EmcXm2DqsPadCtrl4 = 0x003cf3cf,
- .EmcXm2DqsPadCtrl5 = 0x003cf3cf,
- .EmcXm2DqsPadCtrl6 = 0x55555500,
+ .EmcXm2DqsPadCtrl2 = 0x0120113d,
+ .EmcXm2DqsPadCtrl3 = 0x5d569720,
+ .EmcXm2DqsPadCtrl4 = 0x00492492,
+ .EmcXm2DqsPadCtrl5 = 0x00552452,
+ .EmcXm2DqsPadCtrl6 = 0x61751800,
.EmcXm2DqPadCtrl = 0x770c2990,
.EmcXm2DqPadCtrl2 = 0x00000000,
.EmcXm2DqPadCtrl3 = 0x00000000,
.EmcXm2ClkPadCtrl = 0x77ffc085,
- .EmcXm2ClkPadCtrl2 = 0x00000303,
+ .EmcXm2ClkPadCtrl2 = 0x00000000,
.EmcXm2CompPadCtrl = 0x81f1f108,
.EmcXm2VttGenPadCtrl = 0x07070004,
.EmcXm2VttGenPadCtrl2 = 0x00000000,
@@ -273,9 +273,9 @@
.McEmemArbTimingWap2Pre = 0x0000000e,
.McEmemArbTimingR2R = 0x00000002,
.McEmemArbTimingW2W = 0x00000002,
- .McEmemArbTimingR2W = 0x00000006,
+ .McEmemArbTimingR2W = 0x00000007,
.McEmemArbTimingW2R = 0x00000009,
- .McEmemArbDaTurns = 0x09060202,
+ .McEmemArbDaTurns = 0x09070202,
.McEmemArbDaCovers = 0x001a1016,
.McEmemArbMisc0 = 0x734e2a17,
.McEmemArbMisc1 = 0x70000f02,
diff --git a/src/mainboard/google/nyan/sdram_configs.c b/src/mainboard/google/nyan/sdram_configs.c
index a00e8d21a9..3b774b2722 100644
--- a/src/mainboard/google/nyan/sdram_configs.c
+++ b/src/mainboard/google/nyan/sdram_configs.c
@@ -22,7 +22,7 @@
#include "sdram_configs.h"
static struct sdram_params sdram_configs[] = {
-#include "bct/sdram-hynix-2GB-792.inc" /* ram_code = 0000 */
+#include "bct/sdram-hynix-2GB-924.inc" /* ram_code = 0000 */
#include "bct/sdram-hynix-4GB-792.inc" /* ram_code = 0001 */
#include "bct/sdram-unused.inc" /* ram_code = 0010 */
#include "bct/sdram-unused.inc" /* ram_code = 0011 */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 15:07:07 +0000