From a31887b804f23e031c395113db582cd71f3d1b6d Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Thu, 6 Feb 2014 18:02:24 -0800 Subject: [PATCH] nyan: Slightly change the way SDRAM parameter files are set up This patch slightly revises the way the dynamic SDRAM parameter tables are stored in the source tree for nyan and nyan_big. The parameter files are named sdram---.inc (moving frequency last so that files that belong to the same board/ram_code will be together in directory listings). There is also an sdram-unused.inc file that contains an empty "dummy" configuration for unused ram_codes. The inclusion list in sdram_configs.c is annotated with comments to avoid confusion about which line corresponds to which ram_code. Also added another check for MemoryType to sdram_init(), just to be sure. BUG=None TEST=Built and booted Nyan and Nyan_Big successfully. Change-Id: If1406b8d36a37283701c5c272137b34f4324636f Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/185286 Reviewed-by: David Hendricks --- src/mainboard/google/nyan/bct/sdram-0000.inc | 1 - src/mainboard/google/nyan/bct/sdram-0001.inc | 1 - src/mainboard/google/nyan/bct/sdram-0010.inc | 1 - src/mainboard/google/nyan/bct/sdram-0011.inc | 1 - src/mainboard/google/nyan/bct/sdram-0100.inc | 1 - src/mainboard/google/nyan/bct/sdram-0101.inc | 1 - src/mainboard/google/nyan/bct/sdram-0110.inc | 1 - src/mainboard/google/nyan/bct/sdram-0111.inc | 1 - src/mainboard/google/nyan/bct/sdram-1000.inc | 1 - src/mainboard/google/nyan/bct/sdram-1001.inc | 1 - src/mainboard/google/nyan/bct/sdram-1010.inc | 1 - src/mainboard/google/nyan/bct/sdram-1011.inc | 1 - src/mainboard/google/nyan/bct/sdram-1100.inc | 1 - src/mainboard/google/nyan/bct/sdram-1101.inc | 1 - src/mainboard/google/nyan/bct/sdram-1110.inc | 1 - src/mainboard/google/nyan/bct/sdram-1111.inc | 1 - src/mainboard/google/nyan/bct/sdram-dummy.inc | 3 - ...00-792-2GB.inc => sdram-hynix-2GB-792.inc} | 0 ...00-924-2GB.inc => sdram-hynix-2GB-924.inc} | 0 .../google/nyan/bct/sdram-unused.inc | 4 + src/mainboard/google/nyan/sdram_configs.c | 34 +- .../nyan_big/bct/sdram-0100-204-4GB.cfg | 347 ------------------ .../nyan_big/bct/sdram-0100-792-4GB.cfg | 347 ------------------ ...01-204-2GB.inc => sdram-hynix-2GB-204.inc} | 0 ...01-792-2GB.inc => sdram-hynix-2GB-792.inc} | 0 ...01-924-2GB.inc => sdram-hynix-2GB-924.inc} | 0 ...00-204-4GB.inc => sdram-hynix-4GB-204.inc} | 0 ...00-792-4GB.inc => sdram-hynix-4GB-792.inc} | 0 .../google/nyan_big/bct/sdram-unused.inc | 4 + src/mainboard/google/nyan_big/sdram_configs.c | 36 +- src/soc/nvidia/tegra124/sdram.c | 7 + src/soc/nvidia/tegra124/sdram_param.h | 4 +- 32 files changed, 53 insertions(+), 749 deletions(-) delete mode 100644 src/mainboard/google/nyan/bct/sdram-0000.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-0001.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-0010.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-0011.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-0100.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-0101.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-0110.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-0111.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1000.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1001.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1010.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1011.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1100.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1101.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1110.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-1111.inc delete mode 100644 src/mainboard/google/nyan/bct/sdram-dummy.inc rename src/mainboard/google/nyan/bct/{sdram-0000-792-2GB.inc => sdram-hynix-2GB-792.inc} (100%) rename src/mainboard/google/nyan/bct/{sdram-0000-924-2GB.inc => sdram-hynix-2GB-924.inc} (100%) create mode 100644 src/mainboard/google/nyan/bct/sdram-unused.inc delete mode 100644 src/mainboard/google/nyan_big/bct/sdram-0100-204-4GB.cfg delete mode 100644 src/mainboard/google/nyan_big/bct/sdram-0100-792-4GB.cfg rename src/mainboard/google/nyan_big/bct/{sdram-0001-204-2GB.inc => sdram-hynix-2GB-204.inc} (100%) rename src/mainboard/google/nyan_big/bct/{sdram-0001-792-2GB.inc => sdram-hynix-2GB-792.inc} (100%) rename src/mainboard/google/nyan_big/bct/{sdram-0001-924-2GB.inc => sdram-hynix-2GB-924.inc} (100%) rename src/mainboard/google/nyan_big/bct/{sdram-0100-204-4GB.inc => sdram-hynix-4GB-204.inc} (100%) rename src/mainboard/google/nyan_big/bct/{sdram-0100-792-4GB.inc => sdram-hynix-4GB-792.inc} (100%) create mode 100644 src/mainboard/google/nyan_big/bct/sdram-unused.inc diff --git a/src/mainboard/google/nyan/bct/sdram-0000.inc b/src/mainboard/google/nyan/bct/sdram-0000.inc deleted file mode 100644 index ae02bbef9e..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0000.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-0000-792-2GB.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-0001.inc b/src/mainboard/google/nyan/bct/sdram-0001.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0001.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-0010.inc b/src/mainboard/google/nyan/bct/sdram-0010.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0010.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-0011.inc b/src/mainboard/google/nyan/bct/sdram-0011.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0011.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-0100.inc b/src/mainboard/google/nyan/bct/sdram-0100.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0100.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-0101.inc b/src/mainboard/google/nyan/bct/sdram-0101.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0101.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-0110.inc b/src/mainboard/google/nyan/bct/sdram-0110.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0110.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-0111.inc b/src/mainboard/google/nyan/bct/sdram-0111.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-0111.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1000.inc b/src/mainboard/google/nyan/bct/sdram-1000.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1000.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1001.inc b/src/mainboard/google/nyan/bct/sdram-1001.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1001.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1010.inc b/src/mainboard/google/nyan/bct/sdram-1010.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1010.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1011.inc b/src/mainboard/google/nyan/bct/sdram-1011.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1011.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1100.inc b/src/mainboard/google/nyan/bct/sdram-1100.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1100.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1101.inc b/src/mainboard/google/nyan/bct/sdram-1101.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1101.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1110.inc b/src/mainboard/google/nyan/bct/sdram-1110.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1110.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-1111.inc b/src/mainboard/google/nyan/bct/sdram-1111.inc deleted file mode 100644 index 6b813c6bc9..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-1111.inc +++ /dev/null @@ -1 +0,0 @@ -#include "sdram-dummy.inc" diff --git a/src/mainboard/google/nyan/bct/sdram-dummy.inc b/src/mainboard/google/nyan/bct/sdram-dummy.inc deleted file mode 100644 index b2882044e8..0000000000 --- a/src/mainboard/google/nyan/bct/sdram-dummy.inc +++ /dev/null @@ -1,3 +0,0 @@ -{ /* dummy. */ - 0, -}, diff --git a/src/mainboard/google/nyan/bct/sdram-0000-792-2GB.inc b/src/mainboard/google/nyan/bct/sdram-hynix-2GB-792.inc similarity index 100% rename from src/mainboard/google/nyan/bct/sdram-0000-792-2GB.inc rename to src/mainboard/google/nyan/bct/sdram-hynix-2GB-792.inc diff --git a/src/mainboard/google/nyan/bct/sdram-0000-924-2GB.inc b/src/mainboard/google/nyan/bct/sdram-hynix-2GB-924.inc similarity index 100% rename from src/mainboard/google/nyan/bct/sdram-0000-924-2GB.inc rename to src/mainboard/google/nyan/bct/sdram-hynix-2GB-924.inc diff --git a/src/mainboard/google/nyan/bct/sdram-unused.inc b/src/mainboard/google/nyan/bct/sdram-unused.inc new file mode 100644 index 0000000000..bef63dcecc --- /dev/null +++ b/src/mainboard/google/nyan/bct/sdram-unused.inc @@ -0,0 +1,4 @@ +{ /* dummy. */ + .MemoryType = NvBootMemoryType_Unused, + 0, +}, diff --git a/src/mainboard/google/nyan/sdram_configs.c b/src/mainboard/google/nyan/sdram_configs.c index 6b49bc92c7..89e33618fe 100644 --- a/src/mainboard/google/nyan/sdram_configs.c +++ b/src/mainboard/google/nyan/sdram_configs.c @@ -22,22 +22,22 @@ #include "sdram_configs.h" static struct sdram_params sdram_configs[] = { -#include "bct/sdram-0000.inc" -#include "bct/sdram-0001.inc" -#include "bct/sdram-0010.inc" -#include "bct/sdram-0011.inc" -#include "bct/sdram-0100.inc" -#include "bct/sdram-0101.inc" -#include "bct/sdram-0110.inc" -#include "bct/sdram-0111.inc" -#include "bct/sdram-1000.inc" -#include "bct/sdram-1001.inc" -#include "bct/sdram-1010.inc" -#include "bct/sdram-1011.inc" -#include "bct/sdram-1100.inc" -#include "bct/sdram-1101.inc" -#include "bct/sdram-1110.inc" -#include "bct/sdram-1111.inc" +#include "bct/sdram-hynix-2GB-792.inc" /* ram_code = 0000 */ +#include "bct/sdram-unused.inc" /* ram_code = 0001 */ +#include "bct/sdram-unused.inc" /* ram_code = 0010 */ +#include "bct/sdram-unused.inc" /* ram_code = 0011 */ +#include "bct/sdram-unused.inc" /* ram_code = 0100 */ +#include "bct/sdram-unused.inc" /* ram_code = 0101 */ +#include "bct/sdram-unused.inc" /* ram_code = 0110 */ +#include "bct/sdram-unused.inc" /* ram_code = 0111 */ +#include "bct/sdram-unused.inc" /* ram_code = 1000 */ +#include "bct/sdram-unused.inc" /* ram_code = 1001 */ +#include "bct/sdram-unused.inc" /* ram_code = 1010 */ +#include "bct/sdram-unused.inc" /* ram_code = 1011 */ +#include "bct/sdram-unused.inc" /* ram_code = 1100 */ +#include "bct/sdram-unused.inc" /* ram_code = 1101 */ +#include "bct/sdram-unused.inc" /* ram_code = 1110 */ +#include "bct/sdram-unused.inc" /* ram_code = 1111 */ }; const struct sdram_params *get_sdram_config() @@ -50,7 +50,7 @@ const struct sdram_params *get_sdram_config() printk(BIOS_SPEW, "%s: RAMCODE=%d\n", __func__, ramcode); if (ramcode >= sizeof(sdram_configs) / sizeof(sdram_configs[0]) || - sdram_configs[ramcode].AhbArbitrationXbarCtrlMemInitDone == 0) { + sdram_configs[ramcode].MemoryType == NvBootMemoryType_Unused) { die("Invalid RAMCODE."); } diff --git a/src/mainboard/google/nyan_big/bct/sdram-0100-204-4GB.cfg b/src/mainboard/google/nyan_big/bct/sdram-0100-204-4GB.cfg deleted file mode 100644 index 39a8a1c518..0000000000 --- a/src/mainboard/google/nyan_big/bct/sdram-0100-204-4GB.cfg +++ /dev/null @@ -1,347 +0,0 @@ -#Hynix 4GB -# Do not edit. Generated by t124_emc_reg_tool5.0.14.exe V5.0.14. Command: -# t124_emc_reg_tool5.0.14.exe -i extras\param_files\ddr3_512Mx16x4_H5TC8G63AMR_PBA_01212014.par 4.90196 -# -is_mid_package 1 -dram_board_cfg 10 -round_trip_dly_ps 624 -o Big_0121_4GB_204Mhz.cfg -# -b Big_0121_204MHz_emc_reg.txt -# Parameter file: extras\param_files\ddr3_512Mx16x4_H5TC8G63AMR_PBA_01212014.par, tck = 4.90 ns (204.00 MHz) -# bkv file: Big_0121_204MHz_emc_reg.txt -SDRAM[0].MemoryType = NvBootMemoryType_Ddr3; -SDRAM[0].PllMInputDivider = 0x00000001; -SDRAM[0].PllMFeedbackDivider = 0x00000022; -SDRAM[0].PllMStableTime = 0x0000012c; -SDRAM[0].PllMSetupControl = 0x00000000; -SDRAM[0].PllMSelectDiv2 = 0x00000000; -SDRAM[0].PllMPDLshiftPh45 = 0x00000001; -SDRAM[0].PllMPDLshiftPh90 = 0x00000001; -SDRAM[0].PllMPDLshiftPh135 = 0x00000001; -SDRAM[0].PllMKCP = 0x00000000; -SDRAM[0].PllMKVCO = 0x00000000; -SDRAM[0].EmcBctSpare0 = 0x00000000; -SDRAM[0].EmcBctSpare1 = 0x00000000; -SDRAM[0].EmcBctSpare2 = 0x00000000; -SDRAM[0].EmcBctSpare3 = 0x00000000; -SDRAM[0].EmcBctSpare4 = 0x00000000; -SDRAM[0].EmcBctSpare5 = 0x00000000; -SDRAM[0].EmcBctSpare6 = 0x00000000; -SDRAM[0].EmcBctSpare7 = 0x00000000; -SDRAM[0].EmcBctSpare8 = 0x00000000; -SDRAM[0].EmcBctSpare9 = 0x00000000; -SDRAM[0].EmcBctSpare10 = 0x00000000; -SDRAM[0].EmcBctSpare11 = 0x00000000; -SDRAM[0].EmcClockSource = 0x40000002; -SDRAM[0].EmcAutoCalInterval = 0x001fffff; -SDRAM[0].EmcAutoCalConfig = 0xa1430000; -SDRAM[0].EmcAutoCalConfig2 = 0x00000000; -SDRAM[0].EmcAutoCalConfig3 = 0x00000000; -SDRAM[0].EmcAutoCalWait = 0x00000190; -SDRAM[0].EmcAdrCfg = 0x00000001; -SDRAM[0].EmcPinProgramWait = 0x00000001; -SDRAM[0].EmcPinExtraWait = 0x00000000; -SDRAM[0].EmcTimingControlWait = 0x00000000; -SDRAM[0].EmcRc = 0x00000009; -SDRAM[0].EmcRfc = 0x00000047; -SDRAM[0].EmcRfcSlr = 0x00000000; -SDRAM[0].EmcRas = 0x00000007; -SDRAM[0].EmcRp = 0x00000002; -SDRAM[0].EmcR2r = 0x00000000; -SDRAM[0].EmcW2w = 0x00000000; -SDRAM[0].EmcR2w = 0x00000005; -SDRAM[0].EmcW2r = 0x0000000a; -SDRAM[0].EmcR2p = 0x00000003; -SDRAM[0].EmcW2p = 0x0000000b; -SDRAM[0].EmcRdRcd = 0x00000002; -SDRAM[0].EmcWrRcd = 0x00000002; -SDRAM[0].EmcRrd = 0x00000003; -SDRAM[0].EmcRext = 0x00000003; -SDRAM[0].EmcWext = 0x00000000; -SDRAM[0].EmcWdv = 0x00000005; -SDRAM[0].EmcWdvMask = 0x00000005; -SDRAM[0].EmcQUse = 0x00000006; -SDRAM[0].EmcQuseWidth = 0x00000002; -SDRAM[0].EmcIbdly = 0x00000000; -SDRAM[0].EmcEInput = 0x00000004; -SDRAM[0].EmcEInputDuration = 0x00000006; -SDRAM[0].EmcPutermExtra = 0x00010000; -SDRAM[0].EmcPutermWidth = 0x00000003; -SDRAM[0].EmcPutermAdj = 0x00000000; -SDRAM[0].EmcCdbCntl1 = 0x00000000; -SDRAM[0].EmcCdbCntl2 = 0x00000000; -SDRAM[0].EmcCdbCntl3 = 0x00000000; -SDRAM[0].EmcQRst = 0x00000003; -SDRAM[0].EmcQSafe = 0x0000000d; -SDRAM[0].EmcRdv = 0x0000000f; -SDRAM[0].EmcRdvMask = 0x00000011; -SDRAM[0].EmcQpop = 0x0000000a; -SDRAM[0].EmcCtt = 0x00000000; -SDRAM[0].EmcCttDuration = 0x00000003; -SDRAM[0].EmcRefresh = 0x00000607; -SDRAM[0].EmcBurstRefreshNum = 0x00000000; -SDRAM[0].EmcPreRefreshReqCnt = 0x00000181; -SDRAM[0].EmcPdEx2Wr = 0x00000002; -SDRAM[0].EmcPdEx2Rd = 0x00000002; -SDRAM[0].EmcPChg2Pden = 0x00000001; -SDRAM[0].EmcAct2Pden = 0x00000000; -SDRAM[0].EmcAr2Pden = 0x00000044; -SDRAM[0].EmcRw2Pden = 0x0000000f; -SDRAM[0].EmcTxsr = 0x0000004a; -SDRAM[0].EmcTxsrDll = 0x0000004a; -SDRAM[0].EmcTcke = 0x00000004; -SDRAM[0].EmcTckesr = 0x00000005; -SDRAM[0].EmcTpd = 0x00000004; -SDRAM[0].EmcTfaw = 0x00000007; -SDRAM[0].EmcTrpab = 0x00000000; -SDRAM[0].EmcTClkStable = 0x00000005; -SDRAM[0].EmcTClkStop = 0x00000005; -SDRAM[0].EmcTRefBw = 0x00000638; -SDRAM[0].EmcFbioCfg5 = 0x106aa298; -SDRAM[0].EmcFbioCfg6 = 0x00000000; -SDRAM[0].EmcFbioSpare = 0x00000000; -SDRAM[0].EmcCfgRsv = 0xff00ff00; -SDRAM[0].EmcMrs = 0x00001221; -SDRAM[0].EmcEmrs = 0x00100003; -SDRAM[0].EmcEmrs2 = 0x00200008; -SDRAM[0].EmcEmrs3 = 0x00300000; -SDRAM[0].EmcMrw1 = 0x00000000; -SDRAM[0].EmcMrw2 = 0x00000000; -SDRAM[0].EmcMrw3 = 0x00000000; -SDRAM[0].EmcMrw4 = 0x00000000; -SDRAM[0].EmcMrwExtra = 0x00000000; -SDRAM[0].EmcWarmBootMrwExtra = 0x00000000; -SDRAM[0].EmcWarmBootExtraModeRegWriteEnable = 0x00000000; -SDRAM[0].EmcExtraModeRegWriteEnable = 0x00000000; -SDRAM[0].EmcMrwResetCommand = 0x00000000; -SDRAM[0].EmcMrwResetNInitWait = 0x00000000; -SDRAM[0].EmcMrsWaitCnt = 0x000c000c; -SDRAM[0].EmcMrsWaitCnt2 = 0x000c000c; -SDRAM[0].EmcCfg = 0x73240000; -SDRAM[0].EmcCfg2 = 0x0000088d; -SDRAM[0].EmcCfgPipe = 0x0000d2b3; -SDRAM[0].EmcDbg = 0x01000c00; -SDRAM[0].EmcCmdQ = 0x10004408; -SDRAM[0].EmcMc2EmcQ = 0x06000404; -SDRAM[0].EmcDynSelfRefControl = 0x80000d22; -SDRAM[0].AhbArbitrationXbarCtrlMemInitDone = 0x00000001; -SDRAM[0].EmcCfgDigDll = 0x002c00a0; -SDRAM[0].EmcCfgDigDllPeriod = 0x00008000; -SDRAM[0].EmcDevSelect = 0x00000000; -SDRAM[0].EmcSelDpdCtrl = 0x00040008; -SDRAM[0].EmcDllXformDqs0 = 0x00064000; -SDRAM[0].EmcDllXformDqs1 = 0x00064000; -SDRAM[0].EmcDllXformDqs2 = 0x00064000; -SDRAM[0].EmcDllXformDqs3 = 0x00064000; -SDRAM[0].EmcDllXformDqs4 = 0x00064000; -SDRAM[0].EmcDllXformDqs5 = 0x00064000; -SDRAM[0].EmcDllXformDqs6 = 0x00064000; -SDRAM[0].EmcDllXformDqs7 = 0x00064000; -SDRAM[0].EmcDllXformDqs8 = 0x00064000; -SDRAM[0].EmcDllXformDqs9 = 0x00064000; -SDRAM[0].EmcDllXformDqs10 = 0x00064000; -SDRAM[0].EmcDllXformDqs11 = 0x00064000; -SDRAM[0].EmcDllXformDqs12 = 0x00064000; -SDRAM[0].EmcDllXformDqs13 = 0x00064000; -SDRAM[0].EmcDllXformDqs14 = 0x00064000; -SDRAM[0].EmcDllXformDqs15 = 0x00064000; -SDRAM[0].EmcDllXformQUse0 = 0x00000000; -SDRAM[0].EmcDllXformQUse1 = 0x00000000; -SDRAM[0].EmcDllXformQUse2 = 0x00000000; -SDRAM[0].EmcDllXformQUse3 = 0x00000000; -SDRAM[0].EmcDllXformQUse4 = 0x00000000; -SDRAM[0].EmcDllXformQUse5 = 0x00000000; -SDRAM[0].EmcDllXformQUse6 = 0x00000000; -SDRAM[0].EmcDllXformQUse7 = 0x00000000; -SDRAM[0].EmcDllXformAddr0 = 0x00000000; -SDRAM[0].EmcDllXformAddr1 = 0x00000000; -SDRAM[0].EmcDllXformAddr2 = 0x00004000; -SDRAM[0].EmcDllXformAddr3 = 0x00000000; -SDRAM[0].EmcDllXformAddr4 = 0x00000000; -SDRAM[0].EmcDllXformAddr5 = 0x00004000; -SDRAM[0].EmcDllXformQUse8 = 0x00000000; -SDRAM[0].EmcDllXformQUse9 = 0x00000000; -SDRAM[0].EmcDllXformQUse10 = 0x00000000; -SDRAM[0].EmcDllXformQUse11 = 0x00000000; -SDRAM[0].EmcDllXformQUse12 = 0x00000000; -SDRAM[0].EmcDllXformQUse13 = 0x00000000; -SDRAM[0].EmcDllXformQUse14 = 0x00000000; -SDRAM[0].EmcDllXformQUse15 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs0 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs1 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs2 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs3 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs4 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs5 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs6 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs7 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs8 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs9 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs10 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs11 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs12 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs13 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs14 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs15 = 0x00000000; -SDRAM[0].EmcDllXformDq0 = 0x00090000; -SDRAM[0].EmcDllXformDq1 = 0x00090000; -SDRAM[0].EmcDllXformDq2 = 0x00094000; -SDRAM[0].EmcDllXformDq3 = 0x00094000; -SDRAM[0].EmcDllXformDq4 = 0x00009400; -SDRAM[0].EmcDllXformDq5 = 0x00009000; -SDRAM[0].EmcDllXformDq6 = 0x00009000; -SDRAM[0].EmcDllXformDq7 = 0x00009000; -SDRAM[0].WarmBootWait = 0x00000002; -SDRAM[0].EmcCttTermCtrl = 0x00000802; -SDRAM[0].EmcOdtWrite = 0x00000000; -SDRAM[0].EmcOdtRead = 0x00000000; -SDRAM[0].EmcZcalInterval = 0x00020000; -SDRAM[0].EmcZcalWaitCnt = 0x00000042; -SDRAM[0].EmcZcalMrwCmd = 0x00000000; -SDRAM[0].EmcMrsResetDll = 0x00000000; -SDRAM[0].EmcZcalInitDev0 = 0x80000011; -SDRAM[0].EmcZcalInitDev1 = 0x40000011; -SDRAM[0].EmcZcalInitWait = 0x00000003; -SDRAM[0].EmcZcalWarmColdBootEnables = 0x00000003; -SDRAM[0].EmcMrwLpddr2ZcalWarmBoot = 0x040a00ab; -SDRAM[0].EmcZqCalDdr3WarmBoot = 0x00000000; -SDRAM[0].EmcZcalWarmBootWait = 0x00000002; -SDRAM[0].EmcMrsWarmBootEnable = 0x00000001; -SDRAM[0].EmcMrsResetDllWait = 0x00000000; -SDRAM[0].EmcMrsExtra = 0x00001221; -SDRAM[0].EmcWarmBootMrsExtra = 0x00100003; -SDRAM[0].EmcEmrsDdr2DllEnable = 0x00000000; -SDRAM[0].EmcMrsDdr2DllReset = 0x00000000; -SDRAM[0].EmcEmrsDdr2OcdCalib = 0x00000000; -SDRAM[0].EmcDdr2Wait = 0x00000000; -SDRAM[0].EmcClkenOverride = 0x00000000; -SDRAM[0].McDisExtraSnapLevels = 0x00000000; -SDRAM[0].EmcExtraRefreshNum = 0x00000002; -SDRAM[0].EmcClkenOverrideAllWarmBoot = 0x00000000; -SDRAM[0].McClkenOverrideAllWarmBoot = 0x00000000; -SDRAM[0].EmcCfgDigDllPeriodWarmBoot = 0x00000003; -SDRAM[0].PmcVddpSel = 0x00000002; -SDRAM[0].PmcVddpSelWait = 0x00000002; -SDRAM[0].PmcDdrPwr = 0x00000003; -SDRAM[0].PmcDdrCfg = 0x00002002; -SDRAM[0].PmcIoDpd3Req = 0x4fffffff; -SDRAM[0].PmcIoDpd3ReqWait = 0x00000000; -SDRAM[0].PmcRegShort = 0x00000000; -SDRAM[0].PmcNoIoPower = 0x00000000; -SDRAM[0].PmcPorDpdCtrlWait = 0x00000000; -SDRAM[0].EmcXm2CmdPadCtrl = 0x10000280; -SDRAM[0].EmcXm2CmdPadCtrl2 = 0x770c0000; -SDRAM[0].EmcXm2CmdPadCtrl3 = 0x050c0000; -SDRAM[0].EmcXm2CmdPadCtrl4 = 0x00000000; -SDRAM[0].EmcXm2CmdPadCtrl5 = 0x00111111; -SDRAM[0].EmcXm2DqsPadCtrl = 0x770c1414; -SDRAM[0].EmcXm2DqsPadCtrl2 = 0x0130b118; -SDRAM[0].EmcXm2DqsPadCtrl3 = 0x51451400; -SDRAM[0].EmcXm2DqsPadCtrl4 = 0x00514514; -SDRAM[0].EmcXm2DqsPadCtrl5 = 0x00514514; -SDRAM[0].EmcXm2DqsPadCtrl6 = 0x51451400; -SDRAM[0].EmcXm2DqPadCtrl = 0x770c2990; -SDRAM[0].EmcXm2DqPadCtrl2 = 0x00000000; -SDRAM[0].EmcXm2DqPadCtrl3 = 0x00000000; -SDRAM[0].EmcXm2ClkPadCtrl = 0x77ffc081; -SDRAM[0].EmcXm2ClkPadCtrl2 = 0x00000303; -SDRAM[0].EmcXm2CompPadCtrl = 0x81f1f108; -SDRAM[0].EmcXm2VttGenPadCtrl = 0x07070004; -SDRAM[0].EmcXm2VttGenPadCtrl2 = 0x0000003f; -SDRAM[0].EmcXm2VttGenPadCtrl3 = 0x016eeeee; -SDRAM[0].EmcAcpdControl = 0x00000000; -SDRAM[0].EmcSwizzleRank0ByteCfg = 0x00003120; -SDRAM[0].EmcSwizzleRank0Byte0 = 0x25143067; -SDRAM[0].EmcSwizzleRank0Byte1 = 0x45367102; -SDRAM[0].EmcSwizzleRank0Byte2 = 0x47106253; -SDRAM[0].EmcSwizzleRank0Byte3 = 0x04362175; -SDRAM[0].EmcSwizzleRank1ByteCfg = 0x00003120; -SDRAM[0].EmcSwizzleRank1Byte0 = 0x71546032; -SDRAM[0].EmcSwizzleRank1Byte1 = 0x35104276; -SDRAM[0].EmcSwizzleRank1Byte2 = 0x27043615; -SDRAM[0].EmcSwizzleRank1Byte3 = 0x72306145; -SDRAM[0].EmcDsrVttgenDrv = 0x0000003f; -SDRAM[0].EmcTxdsrvttgen = 0x00000066; -SDRAM[0].EmcBgbiasCtl0 = 0x00000008; -SDRAM[0].McEmemAdrCfg = 0x00000001; -SDRAM[0].McEmemAdrCfgDev0 = 0x00080303; -SDRAM[0].McEmemAdrCfgDev1 = 0x00080303; -SDRAM[0].McEmemAdrCfgBankMask0 = 0x00001248; -SDRAM[0].McEmemAdrCfgBankMask1 = 0x00002490; -SDRAM[0].McEmemAdrCfgBankMask2 = 0x00000920; -SDRAM[0].McEmemAdrCfgBankSwizzle3 = 0x00000001; -SDRAM[0].McEmemCfg = 0x00001000; -SDRAM[0].McEmemArbCfg = 0x01000003; -SDRAM[0].McEmemArbOutstandingReq = 0x80000040; -SDRAM[0].McEmemArbTimingRcd = 0x00000001; -SDRAM[0].McEmemArbTimingRp = 0x00000001; -SDRAM[0].McEmemArbTimingRc = 0x00000005; -SDRAM[0].McEmemArbTimingRas = 0x00000002; -SDRAM[0].McEmemArbTimingFaw = 0x00000004; -SDRAM[0].McEmemArbTimingRrd = 0x00000001; -SDRAM[0].McEmemArbTimingRap2Pre = 0x00000002; -SDRAM[0].McEmemArbTimingWap2Pre = 0x00000008; -SDRAM[0].McEmemArbTimingR2R = 0x00000003; -SDRAM[0].McEmemArbTimingW2W = 0x00000002; -SDRAM[0].McEmemArbTimingR2W = 0x00000004; -SDRAM[0].McEmemArbTimingW2R = 0x00000006; -SDRAM[0].McEmemArbDaTurns = 0x06040203; -SDRAM[0].McEmemArbDaCovers = 0x000a0405; -SDRAM[0].McEmemArbMisc0 = 0x74a40a06; -SDRAM[0].McEmemArbMisc1 = 0x70000f03; -SDRAM[0].McEmemArbRing1Throttle = 0x001f0000; -SDRAM[0].McEmemArbOverride = 0x10000000; -SDRAM[0].McEmemArbOverride1 = 0x00000000; -SDRAM[0].McEmemArbRsv = 0xff00ff00; -SDRAM[0].McClkenOverride = 0x00000000; -SDRAM[0].McStatControl = 0x00000000; -SDRAM[0].McDisplaySnapRing = 0x00000003; -SDRAM[0].McVideoProtectBom = 0xfff00000; -SDRAM[0].McVideoProtectBomAdrHi = 0x00000000; -SDRAM[0].McVideoProtectSizeMb = 0x00000000; -SDRAM[0].McVideoProtectVprOverride = 0xe4bac743; -SDRAM[0].McVideoProtectVprOverride1 = 0x00000013; -SDRAM[0].McVideoProtectGpuOverride0 = 0x00000000; -SDRAM[0].McVideoProtectGpuOverride1 = 0x00000000; -SDRAM[0].McSecCarveoutBom = 0xfff00000; -SDRAM[0].McSecCarveoutAdrHi = 0x00000000; -SDRAM[0].McSecCarveoutSizeMb = 0x00000000; -SDRAM[0].McVideoProtectWriteAccess = 0x00000000; -SDRAM[0].McSecCarveoutProtectWriteAccess = 0x00000000; -SDRAM[0].EmcCaTrainingEnable = 0x00000000; -SDRAM[0].EmcCaTrainingTimingCntl1 = 0x1f7df7df; -SDRAM[0].EmcCaTrainingTimingCntl2 = 0x0000001f; -SDRAM[0].SwizzleRankByteEncode = 0x0000006f; -SDRAM[0].BootRomPatchControl = 0x00000000; -SDRAM[0].BootRomPatchData = 0x00000000; -SDRAM[0].McMtsCarveoutBom = 0xfff00000; -SDRAM[0].McMtsCarveoutAdrHi = 0x00000000; -SDRAM[0].McMtsCarveoutSizeMb = 0x00000000; -SDRAM[0].McMtsCarveoutRegCtrl = 0x00000000; -#@ MC_MLL_MPCORER_PTSA_RATE {0x7001944c} = 0x00000001; -#@ MC_PTSA_GRANT_DECREMENT {0x70019960} = 0x00000062; -#@ MC_LATENCY_ALLOWANCE_XUSB_0 {0x7001937c} = 0x00ff006d; -#@ MC_LATENCY_ALLOWANCE_XUSB_1 {0x70019380} = 0x00ff006d; -#@ MC_LATENCY_ALLOWANCE_TSEC_0 {0x70019390} = 0x00ff003c; -#@ MC_LATENCY_ALLOWANCE_SDMMCA_0 {0x700193b8} = 0x00ff00af; -#@ MC_LATENCY_ALLOWANCE_SDMMCAA_0 {0x700193bc} = 0x00ff004f; -#@ MC_LATENCY_ALLOWANCE_SDMMC_0 {0x700193c0} = 0x00ff00af; -#@ MC_LATENCY_ALLOWANCE_SDMMCAB_0 {0x700193c4} = 0x00ff004f; -#@ MC_LATENCY_ALLOWANCE_PPCS_0 {0x70019344} = 0x004e0049; -#@ MC_LATENCY_ALLOWANCE_PPCS_1 {0x70019348} = 0x00ff0080; -#@ MC_LATENCY_ALLOWANCE_MPCORE_0 {0x70019320} = 0x00ff0004; -#@ MC_LATENCY_ALLOWANCE_MPCORELP_0 {0x70019324} = 0x00ff0004; -#@ MC_LATENCY_ALLOWANCE_HC_0 {0x70019310} = 0x00080057; -#@ MC_LATENCY_ALLOWANCE_HC_1 {0x70019314} = 0x000000ff; -#@ MC_LATENCY_ALLOWANCE_AVPC_0 {0x700192e4} = 0x00ff0004; -#@ MC_LATENCY_ALLOWANCE_GPU_0 {0x700193ac} = 0x00ff0063; -#@ MC_LATENCY_ALLOWANCE_MSENC_0 {0x70019328} = 0x00ff0036; -#@ MC_LATENCY_ALLOWANCE_HDA_0 {0x70019318} = 0x00ff0024; -#@ MC_LATENCY_ALLOWANCE_VIC_0 {0x70019394} = 0x00ff006b; -#@ MC_LATENCY_ALLOWANCE_VI2_0 {0x70019398} = 0x000000ff; -#@ MC_LATENCY_ALLOWANCE_ISP2_0 {0x70019370} = 0x00000050; -#@ MC_LATENCY_ALLOWANCE_ISP2_1 {0x70019374} = 0x00ff00ff; -#@ MC_LATENCY_ALLOWANCE_ISP2B_0 {0x70019384} = 0x00000050; -#@ MC_LATENCY_ALLOWANCE_ISP2B_1 {0x70019388} = 0x00ff00ff; -#@ MC_LATENCY_ALLOWANCE_VDE_0 {0x70019354} = 0x00d400ff; -#@ MC_LATENCY_ALLOWANCE_VDE_1 {0x70019358} = 0x00510050; -#@ MC_LATENCY_ALLOWANCE_VDE_2 {0x7001935c} = 0x00ff00ff; -#@ MC_LATENCY_ALLOWANCE_VDE_3 {0x70019360} = 0x00ff00ff; -#@ MC_LATENCY_ALLOWANCE_SATA_0 {0x70019350} = 0x00ff00c6; -#@ MC_LATENCY_ALLOWANCE_AFI_0 {0x700192e0} = 0x00ff006d; diff --git a/src/mainboard/google/nyan_big/bct/sdram-0100-792-4GB.cfg b/src/mainboard/google/nyan_big/bct/sdram-0100-792-4GB.cfg deleted file mode 100644 index dee33159e7..0000000000 --- a/src/mainboard/google/nyan_big/bct/sdram-0100-792-4GB.cfg +++ /dev/null @@ -1,347 +0,0 @@ -#Hynix 4GB -# Do not edit. Generated by t124_emc_reg_tool5.0.14.exe V5.0.14. Command: -# t124_emc_reg_tool5.0.14.exe -i extras\param_files\ddr3_512Mx16x4_H5TC8G63AMR_PBA_01212014.par 1.26262 -# -is_mid_package 1 -dram_board_cfg 10 -round_trip_dly_ps 624 -o Big_0121_4GB_792Mhz.cfg -# -b Big_0121_792MHz_emc_reg.txt -# Parameter file: extras\param_files\ddr3_512Mx16x4_H5TC8G63AMR_PBA_01212014.par, tck = 1.26 ns (792.00 MHz) -# bkv file: Big_0121_792MHz_emc_reg.txt -SDRAM[0].MemoryType = NvBootMemoryType_Ddr3; -SDRAM[0].PllMInputDivider = 0x00000001; -SDRAM[0].PllMFeedbackDivider = 0x00000042; -SDRAM[0].PllMStableTime = 0x0000012c; -SDRAM[0].PllMSetupControl = 0x00000000; -SDRAM[0].PllMSelectDiv2 = 0x00000000; -SDRAM[0].PllMPDLshiftPh45 = 0x00000001; -SDRAM[0].PllMPDLshiftPh90 = 0x00000001; -SDRAM[0].PllMPDLshiftPh135 = 0x00000001; -SDRAM[0].PllMKCP = 0x00000000; -SDRAM[0].PllMKVCO = 0x00000000; -SDRAM[0].EmcBctSpare0 = 0x00000000; -SDRAM[0].EmcBctSpare1 = 0x00000000; -SDRAM[0].EmcBctSpare2 = 0x00000000; -SDRAM[0].EmcBctSpare3 = 0x00000000; -SDRAM[0].EmcBctSpare4 = 0x00000000; -SDRAM[0].EmcBctSpare5 = 0x00000000; -SDRAM[0].EmcBctSpare6 = 0x00000000; -SDRAM[0].EmcBctSpare7 = 0x00000000; -SDRAM[0].EmcBctSpare8 = 0x00000000; -SDRAM[0].EmcBctSpare9 = 0x00000000; -SDRAM[0].EmcBctSpare10 = 0x00000000; -SDRAM[0].EmcBctSpare11 = 0x00000000; -SDRAM[0].EmcClockSource = 0x80000000; -SDRAM[0].EmcAutoCalInterval = 0x001fffff; -SDRAM[0].EmcAutoCalConfig = 0xa1430000; -SDRAM[0].EmcAutoCalConfig2 = 0x00000000; -SDRAM[0].EmcAutoCalConfig3 = 0x00000000; -SDRAM[0].EmcAutoCalWait = 0x00000190; -SDRAM[0].EmcAdrCfg = 0x00000001; -SDRAM[0].EmcPinProgramWait = 0x00000001; -SDRAM[0].EmcPinExtraWait = 0x00000000; -SDRAM[0].EmcTimingControlWait = 0x00000000; -SDRAM[0].EmcRc = 0x00000025; -SDRAM[0].EmcRfc = 0x00000114; -SDRAM[0].EmcRfcSlr = 0x00000000; -SDRAM[0].EmcRas = 0x0000001a; -SDRAM[0].EmcRp = 0x00000007; -SDRAM[0].EmcR2r = 0x00000000; -SDRAM[0].EmcW2w = 0x00000000; -SDRAM[0].EmcR2w = 0x00000008; -SDRAM[0].EmcW2r = 0x0000000d; -SDRAM[0].EmcR2p = 0x00000004; -SDRAM[0].EmcW2p = 0x00000013; -SDRAM[0].EmcRdRcd = 0x00000009; -SDRAM[0].EmcWrRcd = 0x00000009; -SDRAM[0].EmcRrd = 0x00000003; -SDRAM[0].EmcRext = 0x00000002; -SDRAM[0].EmcWext = 0x00000000; -SDRAM[0].EmcWdv = 0x00000006; -SDRAM[0].EmcWdvMask = 0x00000006; -SDRAM[0].EmcQUse = 0x0000000b; -SDRAM[0].EmcQuseWidth = 0x00000002; -SDRAM[0].EmcIbdly = 0x00000000; -SDRAM[0].EmcEInput = 0x00000002; -SDRAM[0].EmcEInputDuration = 0x0000000d; -SDRAM[0].EmcPutermExtra = 0x00080000; -SDRAM[0].EmcPutermWidth = 0x00000004; -SDRAM[0].EmcPutermAdj = 0x00000000; -SDRAM[0].EmcCdbCntl1 = 0x00000000; -SDRAM[0].EmcCdbCntl2 = 0x00000000; -SDRAM[0].EmcCdbCntl3 = 0x00000000; -SDRAM[0].EmcQRst = 0x00000001; -SDRAM[0].EmcQSafe = 0x00000014; -SDRAM[0].EmcRdv = 0x00000018; -SDRAM[0].EmcRdvMask = 0x0000001a; -SDRAM[0].EmcQpop = 0x0000000f; -SDRAM[0].EmcCtt = 0x00000000; -SDRAM[0].EmcCttDuration = 0x00000004; -SDRAM[0].EmcRefresh = 0x000017e2; -SDRAM[0].EmcBurstRefreshNum = 0x00000000; -SDRAM[0].EmcPreRefreshReqCnt = 0x000005f8; -SDRAM[0].EmcPdEx2Wr = 0x00000003; -SDRAM[0].EmcPdEx2Rd = 0x00000011; -SDRAM[0].EmcPChg2Pden = 0x00000001; -SDRAM[0].EmcAct2Pden = 0x00000000; -SDRAM[0].EmcAr2Pden = 0x0000010d; -SDRAM[0].EmcRw2Pden = 0x00000018; -SDRAM[0].EmcTxsr = 0x0000011e; -SDRAM[0].EmcTxsrDll = 0x00000200; -SDRAM[0].EmcTcke = 0x00000005; -SDRAM[0].EmcTckesr = 0x00000006; -SDRAM[0].EmcTpd = 0x00000005; -SDRAM[0].EmcTfaw = 0x0000001d; -SDRAM[0].EmcTrpab = 0x00000000; -SDRAM[0].EmcTClkStable = 0x00000008; -SDRAM[0].EmcTClkStop = 0x00000008; -SDRAM[0].EmcTRefBw = 0x00001822; -SDRAM[0].EmcFbioCfg5 = 0x104ab098; -SDRAM[0].EmcFbioCfg6 = 0x00000000; -SDRAM[0].EmcFbioSpare = 0x00000000; -SDRAM[0].EmcCfgRsv = 0xff00ff00; -SDRAM[0].EmcMrs = 0x00000d71; -SDRAM[0].EmcEmrs = 0x00100002; -SDRAM[0].EmcEmrs2 = 0x00200018; -SDRAM[0].EmcEmrs3 = 0x00300000; -SDRAM[0].EmcMrw1 = 0x00000000; -SDRAM[0].EmcMrw2 = 0x00000000; -SDRAM[0].EmcMrw3 = 0x00000000; -SDRAM[0].EmcMrw4 = 0x00000000; -SDRAM[0].EmcMrwExtra = 0x00000000; -SDRAM[0].EmcWarmBootMrwExtra = 0x00000000; -SDRAM[0].EmcWarmBootExtraModeRegWriteEnable = 0x00000000; -SDRAM[0].EmcExtraModeRegWriteEnable = 0x00000000; -SDRAM[0].EmcMrwResetCommand = 0x00000000; -SDRAM[0].EmcMrwResetNInitWait = 0x00000000; -SDRAM[0].EmcMrsWaitCnt = 0x006f000c; -SDRAM[0].EmcMrsWaitCnt2 = 0x006f000c; -SDRAM[0].EmcCfg = 0x73300000; -SDRAM[0].EmcCfg2 = 0x0000089d; -SDRAM[0].EmcCfgPipe = 0x00004080; -SDRAM[0].EmcDbg = 0x01000c00; -SDRAM[0].EmcCmdQ = 0x10004408; -SDRAM[0].EmcMc2EmcQ = 0x06000404; -SDRAM[0].EmcDynSelfRefControl = 0x80003012; -SDRAM[0].AhbArbitrationXbarCtrlMemInitDone = 0x00000001; -SDRAM[0].EmcCfgDigDll = 0xe00700b1; -SDRAM[0].EmcCfgDigDllPeriod = 0x00008000; -SDRAM[0].EmcDevSelect = 0x00000000; -SDRAM[0].EmcSelDpdCtrl = 0x00040000; -SDRAM[0].EmcDllXformDqs0 = 0x00000008; -SDRAM[0].EmcDllXformDqs1 = 0x00000008; -SDRAM[0].EmcDllXformDqs2 = 0x00000008; -SDRAM[0].EmcDllXformDqs3 = 0x00000008; -SDRAM[0].EmcDllXformDqs4 = 0x00000008; -SDRAM[0].EmcDllXformDqs5 = 0x00000008; -SDRAM[0].EmcDllXformDqs6 = 0x00000008; -SDRAM[0].EmcDllXformDqs7 = 0x00000008; -SDRAM[0].EmcDllXformDqs8 = 0x00000008; -SDRAM[0].EmcDllXformDqs9 = 0x00000008; -SDRAM[0].EmcDllXformDqs10 = 0x00000008; -SDRAM[0].EmcDllXformDqs11 = 0x00000008; -SDRAM[0].EmcDllXformDqs12 = 0x00000008; -SDRAM[0].EmcDllXformDqs13 = 0x00000008; -SDRAM[0].EmcDllXformDqs14 = 0x00000008; -SDRAM[0].EmcDllXformDqs15 = 0x00000008; -SDRAM[0].EmcDllXformQUse0 = 0x00000000; -SDRAM[0].EmcDllXformQUse1 = 0x00000000; -SDRAM[0].EmcDllXformQUse2 = 0x00000000; -SDRAM[0].EmcDllXformQUse3 = 0x00000000; -SDRAM[0].EmcDllXformQUse4 = 0x00000000; -SDRAM[0].EmcDllXformQUse5 = 0x00000000; -SDRAM[0].EmcDllXformQUse6 = 0x00000000; -SDRAM[0].EmcDllXformQUse7 = 0x00000000; -SDRAM[0].EmcDllXformAddr0 = 0x00034000; -SDRAM[0].EmcDllXformAddr1 = 0x00034000; -SDRAM[0].EmcDllXformAddr2 = 0x00000000; -SDRAM[0].EmcDllXformAddr3 = 0x00034000; -SDRAM[0].EmcDllXformAddr4 = 0x00034000; -SDRAM[0].EmcDllXformAddr5 = 0x00000000; -SDRAM[0].EmcDllXformQUse8 = 0x00000000; -SDRAM[0].EmcDllXformQUse9 = 0x00000000; -SDRAM[0].EmcDllXformQUse10 = 0x00000000; -SDRAM[0].EmcDllXformQUse11 = 0x00000000; -SDRAM[0].EmcDllXformQUse12 = 0x00000000; -SDRAM[0].EmcDllXformQUse13 = 0x00000000; -SDRAM[0].EmcDllXformQUse14 = 0x00000000; -SDRAM[0].EmcDllXformQUse15 = 0x00000000; -SDRAM[0].EmcDliTrimTxDqs0 = 0x00000008; -SDRAM[0].EmcDliTrimTxDqs1 = 0x00000008; -SDRAM[0].EmcDliTrimTxDqs2 = 0x00000005; -SDRAM[0].EmcDliTrimTxDqs3 = 0x00000009; -SDRAM[0].EmcDliTrimTxDqs4 = 0x00000009; -SDRAM[0].EmcDliTrimTxDqs5 = 0x00000007; -SDRAM[0].EmcDliTrimTxDqs6 = 0x00000009; -SDRAM[0].EmcDliTrimTxDqs7 = 0x00000008; -SDRAM[0].EmcDliTrimTxDqs8 = 0x00000008; -SDRAM[0].EmcDliTrimTxDqs9 = 0x00000008; -SDRAM[0].EmcDliTrimTxDqs10 = 0x00000005; -SDRAM[0].EmcDliTrimTxDqs11 = 0x00000009; -SDRAM[0].EmcDliTrimTxDqs12 = 0x00000009; -SDRAM[0].EmcDliTrimTxDqs13 = 0x00000007; -SDRAM[0].EmcDliTrimTxDqs14 = 0x00000009; -SDRAM[0].EmcDliTrimTxDqs15 = 0x00000008; -SDRAM[0].EmcDllXformDq0 = 0x0000000e; -SDRAM[0].EmcDllXformDq1 = 0x0000000e; -SDRAM[0].EmcDllXformDq2 = 0x0000000e; -SDRAM[0].EmcDllXformDq3 = 0x0000000e; -SDRAM[0].EmcDllXformDq4 = 0x0000000e; -SDRAM[0].EmcDllXformDq5 = 0x0000000e; -SDRAM[0].EmcDllXformDq6 = 0x0000000e; -SDRAM[0].EmcDllXformDq7 = 0x0000000e; -SDRAM[0].WarmBootWait = 0x00000002; -SDRAM[0].EmcCttTermCtrl = 0x00000802; -SDRAM[0].EmcOdtWrite = 0x00000000; -SDRAM[0].EmcOdtRead = 0x00000000; -SDRAM[0].EmcZcalInterval = 0x00020000; -SDRAM[0].EmcZcalWaitCnt = 0x00000042; -SDRAM[0].EmcZcalMrwCmd = 0x00000000; -SDRAM[0].EmcMrsResetDll = 0x00000000; -SDRAM[0].EmcZcalInitDev0 = 0x80000011; -SDRAM[0].EmcZcalInitDev1 = 0x40000011; -SDRAM[0].EmcZcalInitWait = 0x00000001; -SDRAM[0].EmcZcalWarmColdBootEnables = 0x00000003; -SDRAM[0].EmcMrwLpddr2ZcalWarmBoot = 0x040a00ab; -SDRAM[0].EmcZqCalDdr3WarmBoot = 0x00000000; -SDRAM[0].EmcZcalWarmBootWait = 0x00000001; -SDRAM[0].EmcMrsWarmBootEnable = 0x00000001; -SDRAM[0].EmcMrsResetDllWait = 0x00000000; -SDRAM[0].EmcMrsExtra = 0x00000d71; -SDRAM[0].EmcWarmBootMrsExtra = 0x00100002; -SDRAM[0].EmcEmrsDdr2DllEnable = 0x00000000; -SDRAM[0].EmcMrsDdr2DllReset = 0x00000000; -SDRAM[0].EmcEmrsDdr2OcdCalib = 0x00000000; -SDRAM[0].EmcDdr2Wait = 0x00000000; -SDRAM[0].EmcClkenOverride = 0x00000000; -SDRAM[0].McDisExtraSnapLevels = 0x00000000; -SDRAM[0].EmcExtraRefreshNum = 0x00000002; -SDRAM[0].EmcClkenOverrideAllWarmBoot = 0x00000000; -SDRAM[0].McClkenOverrideAllWarmBoot = 0x00000000; -SDRAM[0].EmcCfgDigDllPeriodWarmBoot = 0x00000003; -SDRAM[0].PmcVddpSel = 0x00000002; -SDRAM[0].PmcVddpSelWait = 0x00000002; -SDRAM[0].PmcDdrPwr = 0x00000003; -SDRAM[0].PmcDdrCfg = 0x00002002; -SDRAM[0].PmcIoDpd3Req = 0x4fffffff; -SDRAM[0].PmcIoDpd3ReqWait = 0x00000000; -SDRAM[0].PmcRegShort = 0x00000000; -SDRAM[0].PmcNoIoPower = 0x00000000; -SDRAM[0].PmcPorDpdCtrlWait = 0x00000000; -SDRAM[0].EmcXm2CmdPadCtrl = 0x100002a0; -SDRAM[0].EmcXm2CmdPadCtrl2 = 0x770c0000; -SDRAM[0].EmcXm2CmdPadCtrl3 = 0x050c0000; -SDRAM[0].EmcXm2CmdPadCtrl4 = 0x00000000; -SDRAM[0].EmcXm2CmdPadCtrl5 = 0x00111111; -SDRAM[0].EmcXm2DqsPadCtrl = 0x770c1414; -SDRAM[0].EmcXm2DqsPadCtrl2 = 0x0120113d; -SDRAM[0].EmcXm2DqsPadCtrl3 = 0x61861820; -SDRAM[0].EmcXm2DqsPadCtrl4 = 0x00514514; -SDRAM[0].EmcXm2DqsPadCtrl5 = 0x00514514; -SDRAM[0].EmcXm2DqsPadCtrl6 = 0x61861800; -SDRAM[0].EmcXm2DqPadCtrl = 0x770c2990; -SDRAM[0].EmcXm2DqPadCtrl2 = 0x00000000; -SDRAM[0].EmcXm2DqPadCtrl3 = 0x00000000; -SDRAM[0].EmcXm2ClkPadCtrl = 0x77ffc085; -SDRAM[0].EmcXm2ClkPadCtrl2 = 0x00000101; -SDRAM[0].EmcXm2CompPadCtrl = 0x81f1f108; -SDRAM[0].EmcXm2VttGenPadCtrl = 0x07070004; -SDRAM[0].EmcXm2VttGenPadCtrl2 = 0x00000000; -SDRAM[0].EmcXm2VttGenPadCtrl3 = 0x016eeeee; -SDRAM[0].EmcAcpdControl = 0x00000000; -SDRAM[0].EmcSwizzleRank0ByteCfg = 0x00003120; -SDRAM[0].EmcSwizzleRank0Byte0 = 0x25143067; -SDRAM[0].EmcSwizzleRank0Byte1 = 0x45367102; -SDRAM[0].EmcSwizzleRank0Byte2 = 0x47106253; -SDRAM[0].EmcSwizzleRank0Byte3 = 0x04362175; -SDRAM[0].EmcSwizzleRank1ByteCfg = 0x00003120; -SDRAM[0].EmcSwizzleRank1Byte0 = 0x71546032; -SDRAM[0].EmcSwizzleRank1Byte1 = 0x35104276; -SDRAM[0].EmcSwizzleRank1Byte2 = 0x27043615; -SDRAM[0].EmcSwizzleRank1Byte3 = 0x72306145; -SDRAM[0].EmcDsrVttgenDrv = 0x0606003f; -SDRAM[0].EmcTxdsrvttgen = 0x00000000; -SDRAM[0].EmcBgbiasCtl0 = 0x00000000; -SDRAM[0].McEmemAdrCfg = 0x00000001; -SDRAM[0].McEmemAdrCfgDev0 = 0x00080303; -SDRAM[0].McEmemAdrCfgDev1 = 0x00080303; -SDRAM[0].McEmemAdrCfgBankMask0 = 0x00001248; -SDRAM[0].McEmemAdrCfgBankMask1 = 0x00002490; -SDRAM[0].McEmemAdrCfgBankMask2 = 0x00000920; -SDRAM[0].McEmemAdrCfgBankSwizzle3 = 0x00000001; -SDRAM[0].McEmemCfg = 0x00001000; -SDRAM[0].McEmemArbCfg = 0x0e00000b; -SDRAM[0].McEmemArbOutstandingReq = 0x80000040; -SDRAM[0].McEmemArbTimingRcd = 0x00000004; -SDRAM[0].McEmemArbTimingRp = 0x00000004; -SDRAM[0].McEmemArbTimingRc = 0x00000013; -SDRAM[0].McEmemArbTimingRas = 0x0000000c; -SDRAM[0].McEmemArbTimingFaw = 0x0000000f; -SDRAM[0].McEmemArbTimingRrd = 0x00000002; -SDRAM[0].McEmemArbTimingRap2Pre = 0x00000003; -SDRAM[0].McEmemArbTimingWap2Pre = 0x0000000c; -SDRAM[0].McEmemArbTimingR2R = 0x00000002; -SDRAM[0].McEmemArbTimingW2W = 0x00000002; -SDRAM[0].McEmemArbTimingR2W = 0x00000006; -SDRAM[0].McEmemArbTimingW2R = 0x00000008; -SDRAM[0].McEmemArbDaTurns = 0x08060202; -SDRAM[0].McEmemArbDaCovers = 0x00150c13; -SDRAM[0].McEmemArbMisc0 = 0x746c2414; -SDRAM[0].McEmemArbMisc1 = 0x70000f02; -SDRAM[0].McEmemArbRing1Throttle = 0x001f0000; -SDRAM[0].McEmemArbOverride = 0x10000000; -SDRAM[0].McEmemArbOverride1 = 0x00000000; -SDRAM[0].McEmemArbRsv = 0xff00ff00; -SDRAM[0].McClkenOverride = 0x00000000; -SDRAM[0].McStatControl = 0x00000000; -SDRAM[0].McDisplaySnapRing = 0x00000003; -SDRAM[0].McVideoProtectBom = 0xfff00000; -SDRAM[0].McVideoProtectBomAdrHi = 0x00000000; -SDRAM[0].McVideoProtectSizeMb = 0x00000000; -SDRAM[0].McVideoProtectVprOverride = 0xe4bac743; -SDRAM[0].McVideoProtectVprOverride1 = 0x00000013; -SDRAM[0].McVideoProtectGpuOverride0 = 0x00000000; -SDRAM[0].McVideoProtectGpuOverride1 = 0x00000000; -SDRAM[0].McSecCarveoutBom = 0xfff00000; -SDRAM[0].McSecCarveoutAdrHi = 0x00000000; -SDRAM[0].McSecCarveoutSizeMb = 0x00000000; -SDRAM[0].McVideoProtectWriteAccess = 0x00000000; -SDRAM[0].McSecCarveoutProtectWriteAccess = 0x00000000; -SDRAM[0].EmcCaTrainingEnable = 0x00000000; -SDRAM[0].EmcCaTrainingTimingCntl1 = 0x1f7df7df; -SDRAM[0].EmcCaTrainingTimingCntl2 = 0x0000001f; -SDRAM[0].SwizzleRankByteEncode = 0x0000006f; -SDRAM[0].BootRomPatchControl = 0x00000000; -SDRAM[0].BootRomPatchData = 0x00000000; -SDRAM[0].McMtsCarveoutBom = 0xfff00000; -SDRAM[0].McMtsCarveoutAdrHi = 0x00000000; -SDRAM[0].McMtsCarveoutSizeMb = 0x00000000; -SDRAM[0].McMtsCarveoutRegCtrl = 0x00000000; -#@ MC_MLL_MPCORER_PTSA_RATE {0x7001944c} = 0x00000013; -#@ MC_PTSA_GRANT_DECREMENT {0x70019960} = 0x0000017c; -#@ MC_LATENCY_ALLOWANCE_XUSB_0 {0x7001937c} = 0x00810038; -#@ MC_LATENCY_ALLOWANCE_XUSB_1 {0x70019380} = 0x00810038; -#@ MC_LATENCY_ALLOWANCE_TSEC_0 {0x70019390} = 0x0081003c; -#@ MC_LATENCY_ALLOWANCE_SDMMCA_0 {0x700193b8} = 0x00810090; -#@ MC_LATENCY_ALLOWANCE_SDMMCAA_0 {0x700193bc} = 0x00810041; -#@ MC_LATENCY_ALLOWANCE_SDMMC_0 {0x700193c0} = 0x00810090; -#@ MC_LATENCY_ALLOWANCE_SDMMCAB_0 {0x700193c4} = 0x00810041; -#@ MC_LATENCY_ALLOWANCE_PPCS_0 {0x70019344} = 0x00270049; -#@ MC_LATENCY_ALLOWANCE_PPCS_1 {0x70019348} = 0x00810080; -#@ MC_LATENCY_ALLOWANCE_MPCORE_0 {0x70019320} = 0x00810004; -#@ MC_LATENCY_ALLOWANCE_MPCORELP_0 {0x70019324} = 0x00810004; -#@ MC_LATENCY_ALLOWANCE_HC_0 {0x70019310} = 0x00080016; -#@ MC_LATENCY_ALLOWANCE_HC_1 {0x70019314} = 0x00000081; -#@ MC_LATENCY_ALLOWANCE_AVPC_0 {0x700192e4} = 0x00810004; -#@ MC_LATENCY_ALLOWANCE_GPU_0 {0x700193ac} = 0x00810019; -#@ MC_LATENCY_ALLOWANCE_MSENC_0 {0x70019328} = 0x00810018; -#@ MC_LATENCY_ALLOWANCE_HDA_0 {0x70019318} = 0x00810024; -#@ MC_LATENCY_ALLOWANCE_VIC_0 {0x70019394} = 0x0081001c; -#@ MC_LATENCY_ALLOWANCE_VI2_0 {0x70019398} = 0x00000081; -#@ MC_LATENCY_ALLOWANCE_ISP2_0 {0x70019370} = 0x00000036; -#@ MC_LATENCY_ALLOWANCE_ISP2_1 {0x70019374} = 0x00810081; -#@ MC_LATENCY_ALLOWANCE_ISP2B_0 {0x70019384} = 0x00000036; -#@ MC_LATENCY_ALLOWANCE_ISP2B_1 {0x70019388} = 0x00810081; -#@ MC_LATENCY_ALLOWANCE_VDE_0 {0x70019354} = 0x00d400ff; -#@ MC_LATENCY_ALLOWANCE_VDE_1 {0x70019358} = 0x00510029; -#@ MC_LATENCY_ALLOWANCE_VDE_2 {0x7001935c} = 0x00810081; -#@ MC_LATENCY_ALLOWANCE_VDE_3 {0x70019360} = 0x00810081; -#@ MC_LATENCY_ALLOWANCE_SATA_0 {0x70019350} = 0x00810065; -#@ MC_LATENCY_ALLOWANCE_AFI_0 {0x700192e0} = 0x0081001c; diff --git a/src/mainboard/google/nyan_big/bct/sdram-0001-204-2GB.inc b/src/mainboard/google/nyan_big/bct/sdram-hynix-2GB-204.inc similarity index 100% rename from src/mainboard/google/nyan_big/bct/sdram-0001-204-2GB.inc rename to src/mainboard/google/nyan_big/bct/sdram-hynix-2GB-204.inc diff --git a/src/mainboard/google/nyan_big/bct/sdram-0001-792-2GB.inc b/src/mainboard/google/nyan_big/bct/sdram-hynix-2GB-792.inc similarity index 100% rename from src/mainboard/google/nyan_big/bct/sdram-0001-792-2GB.inc rename to src/mainboard/google/nyan_big/bct/sdram-hynix-2GB-792.inc diff --git a/src/mainboard/google/nyan_big/bct/sdram-0001-924-2GB.inc b/src/mainboard/google/nyan_big/bct/sdram-hynix-2GB-924.inc similarity index 100% rename from src/mainboard/google/nyan_big/bct/sdram-0001-924-2GB.inc rename to src/mainboard/google/nyan_big/bct/sdram-hynix-2GB-924.inc diff --git a/src/mainboard/google/nyan_big/bct/sdram-0100-204-4GB.inc b/src/mainboard/google/nyan_big/bct/sdram-hynix-4GB-204.inc similarity index 100% rename from src/mainboard/google/nyan_big/bct/sdram-0100-204-4GB.inc rename to src/mainboard/google/nyan_big/bct/sdram-hynix-4GB-204.inc diff --git a/src/mainboard/google/nyan_big/bct/sdram-0100-792-4GB.inc b/src/mainboard/google/nyan_big/bct/sdram-hynix-4GB-792.inc similarity index 100% rename from src/mainboard/google/nyan_big/bct/sdram-0100-792-4GB.inc rename to src/mainboard/google/nyan_big/bct/sdram-hynix-4GB-792.inc diff --git a/src/mainboard/google/nyan_big/bct/sdram-unused.inc b/src/mainboard/google/nyan_big/bct/sdram-unused.inc new file mode 100644 index 0000000000..bef63dcecc --- /dev/null +++ b/src/mainboard/google/nyan_big/bct/sdram-unused.inc @@ -0,0 +1,4 @@ +{ /* dummy. */ + .MemoryType = NvBootMemoryType_Unused, + 0, +}, diff --git a/src/mainboard/google/nyan_big/sdram_configs.c b/src/mainboard/google/nyan_big/sdram_configs.c index d407db4489..2aaace4b0c 100644 --- a/src/mainboard/google/nyan_big/sdram_configs.c +++ b/src/mainboard/google/nyan_big/sdram_configs.c @@ -23,25 +23,25 @@ /* * Note for board bring up, we've temporarily filled SDRAM table with - * 0001-204-2GB configuration (except the 0100-204-4GB entry). + * hynix-2GB-204 configuration (except the hynix-4GB-204 entry for 0100). */ static struct sdram_params sdram_configs[] = { -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0100-204-4GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" -#include "bct/sdram-0001-204-2GB.inc" +#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-204.inc" /* ram_code = 0011 */ +#include "bct/sdram-hynix-4GB-204.inc" /* ram_code = 0100 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 0101 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 0110 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 0111 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1000 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1001 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1010 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1011 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1100 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1101 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1110 */ +#include "bct/sdram-hynix-2GB-204.inc" /* ram_code = 1111 */ }; const struct sdram_params *get_sdram_config() @@ -54,7 +54,7 @@ const struct sdram_params *get_sdram_config() printk(BIOS_SPEW, "%s: RAMCODE=%d\n", __func__, ramcode); if (ramcode >= sizeof(sdram_configs) / sizeof(sdram_configs[0]) || - sdram_configs[ramcode].AhbArbitrationXbarCtrlMemInitDone == 0) { + sdram_configs[ramcode].MemoryType == NvBootMemoryType_Unused) { die("Invalid RAMCODE."); } diff --git a/src/soc/nvidia/tegra124/sdram.c b/src/soc/nvidia/tegra124/sdram.c index 19c3b42d13..dcab810a45 100644 --- a/src/soc/nvidia/tegra124/sdram.c +++ b/src/soc/nvidia/tegra124/sdram.c @@ -568,6 +568,13 @@ void sdram_init(const struct sdram_params *param) struct tegra_mc_regs *mc = (struct tegra_mc_regs*)TEGRA_MC_BASE; struct tegra_emc_regs *emc = (struct tegra_emc_regs*)TEGRA_EMC_BASE; + printk(BIOS_DEBUG, "Initializing SDRAM of type %d with %dKHz\n", + param->MemoryType, clock_get_osc_khz() * + param->PllMFeedbackDivider / param->PllMInputDivider / + (1 + param->PllMSelectDiv2)); + if (param->MemoryType != NvBootMemoryType_Ddr3) + die("Unsupported memory type!\n"); + sdram_configure_pmc(param, pmc); sdram_patch(param->EmcBctSpare0, param->EmcBctSpare1); diff --git a/src/soc/nvidia/tegra124/sdram_param.h b/src/soc/nvidia/tegra124/sdram_param.h index 33ab1516d1..c845611da0 100644 --- a/src/soc/nvidia/tegra124/sdram_param.h +++ b/src/soc/nvidia/tegra124/sdram_param.h @@ -51,7 +51,9 @@ enum { NvBootMemoryType_Ddr3, NvBootMemoryType_Num, - NvBootMemoryType_Force32 = 0X7FFFFFF, + + /* Specifies an entry in the ram_code table that's not in use */ + NvBootMemoryType_Unused = 0X7FFFFFF, }; enum {