123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820 |
- From c70f2ebb350da20af1a0ed4b7960b8e5a1952713 Mon Sep 17 00:00:00 2001
- From: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
- Date: Thu, 20 Feb 2014 11:51:31 -0500
- Subject: [PATCH] board: add to sockit a working preloader design
- ---
- board/altera/socfpga_cyclone5/build.h | 2 +-
- board/altera/socfpga_cyclone5/iocsr_config.c | 314 ++++++++++-----------
- board/altera/socfpga_cyclone5/pinmux_config.c | 32 +--
- board/altera/socfpga_cyclone5/pinmux_config.h | 8 +-
- board/altera/socfpga_cyclone5/sdram/sdram_config.h | 14 +-
- .../altera/socfpga_cyclone5/sdram/sequencer_auto.h | 16 +-
- .../sdram/sequencer_auto_ac_init.c | 16 +-
- .../socfpga_cyclone5/sdram/sequencer_defines.h | 34 +--
- 8 files changed, 218 insertions(+), 218 deletions(-)
- diff --git a/board/altera/socfpga_cyclone5/build.h b/board/altera/socfpga_cyclone5/build.h
- index e5d9c3c..a369015 100644
- --- a/board/altera/socfpga_cyclone5/build.h
- +++ b/board/altera/socfpga_cyclone5/build.h
- @@ -29,7 +29,7 @@
- * Handoff files must provide user option whether to
- * enable watchdog during preloader execution phase
- */
- -#define CONFIG_PRELOADER_WATCHDOG_ENABLE (0)
- +#define CONFIG_PRELOADER_WATCHDOG_ENABLE (1)
-
- /*
- * Handoff files must provide user option whether to enable
- diff --git a/board/altera/socfpga_cyclone5/iocsr_config.c b/board/altera/socfpga_cyclone5/iocsr_config.c
- index fa663e1..90fc154 100644
- --- a/board/altera/socfpga_cyclone5/iocsr_config.c
- +++ b/board/altera/socfpga_cyclone5/iocsr_config.c
- @@ -7,113 +7,113 @@ const unsigned long iocsr_scan_chain0_table[((CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH
- 0xC0000000,
- 0x0000003F,
- 0x00008000,
- - 0x00020080,
- - 0x08020000,
- - 0x08000000,
- - 0x00018020,
- + 0x00060180,
- + 0x18060000,
- + 0x18000000,
- + 0x00018060,
- 0x00000000,
- 0x00004000,
- - 0x00010040,
- - 0x04010000,
- - 0x04000000,
- - 0x00000010,
- - 0x00004010,
- + 0x000300C0,
- + 0x0C030000,
- + 0x0C000000,
- + 0x00000030,
- + 0x0000C030,
- 0x00002000,
- - 0x00020000,
- - 0x02008000,
- - 0x02000000,
- - 0x00000008,
- - 0x00002008,
- + 0x00018060,
- + 0x06018000,
- + 0x06000000,
- + 0x00000018,
- + 0x00006018,
- 0x00001000,
- };
-
- const unsigned long iocsr_scan_chain1_table[((CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH / 32) + 1)] = {
- - 0x000C0300,
- - 0x10040000,
- - 0x100000C0,
- - 0x00000040,
- - 0x00010040,
- + 0x00100000,
- + 0x300C0000,
- + 0x300000C0,
- + 0x000000C0,
- + 0x000300C0,
- 0x00008000,
- 0x00080000,
- - 0x18060000,
- - 0x18000000,
- - 0x00000060,
- - 0x00018060,
- + 0x20000000,
- + 0x00000000,
- + 0x00000080,
- + 0x00020000,
- 0x00004000,
- - 0x00010040,
- + 0x000300C0,
- 0x10000000,
- - 0x04000000,
- - 0x00000010,
- - 0x00004010,
- + 0x0C000000,
- + 0x00000030,
- + 0x0000C030,
- 0x00002000,
- - 0x06008020,
- - 0x02008000,
- + 0x06018060,
- + 0x06018000,
- 0x01FE0000,
- 0xF8000000,
- 0x00000007,
- 0x00001000,
- - 0x00004010,
- - 0x01004000,
- - 0x01000000,
- - 0x00003004,
- - 0x00001004,
- + 0x0000C030,
- + 0x0300C000,
- + 0x03000000,
- + 0x0000300C,
- + 0x0000300C,
- 0x00000800,
- 0x00000000,
- 0x00000000,
- - 0x00800000,
- - 0x00000002,
- + 0x01800000,
- + 0x00000006,
- 0x00002000,
- 0x00000400,
- 0x00000000,
- - 0x00401000,
- + 0x00C03000,
- 0x00000003,
- 0x00000000,
- 0x00000000,
- 0x00000200,
- - 0x00600802,
- + 0x00601806,
- 0x00000000,
- - 0x80200000,
- - 0x80000600,
- - 0x00000200,
- + 0x80600000,
- + 0x80000601,
- + 0x00000601,
- 0x00000100,
- - 0x00300401,
- - 0xC0100400,
- - 0x40100000,
- - 0x40000300,
- - 0x000C0100,
- + 0x00300C03,
- + 0xC0300C00,
- + 0xC0300000,
- + 0xC0000300,
- + 0x000C0300,
- 0x00000080,
- };
-
- const unsigned long iocsr_scan_chain2_table[((CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH / 32) + 1)] = {
- - 0x80040100,
- + 0x300C0300,
- 0x00000000,
- 0x0FF00000,
- 0x00000000,
- - 0x0C010040,
- + 0x0C0300C0,
- 0x00008000,
- - 0x18020080,
- - 0x00000000,
- - 0x08000000,
- - 0x00040020,
- - 0x06018060,
- + 0x18060180,
- + 0x18060000,
- + 0x18000000,
- + 0x00018060,
- + 0x00018060,
- 0x00004000,
- - 0x0C010040,
- - 0x04010000,
- + 0x000300C0,
- + 0x0C030000,
- 0x00000030,
- 0x00000000,
- - 0x03004010,
- + 0x0300C030,
- 0x00002000,
- - 0x06008020,
- - 0x02008000,
- - 0x02000018,
- - 0x00006008,
- - 0x01802008,
- + 0x00018060,
- + 0x06018000,
- + 0x06000000,
- + 0x00000018,
- + 0x00006018,
- 0x00001000,
- - 0x03004010,
- - 0x01004000,
- - 0x0100000C,
- - 0x00003004,
- - 0x00C01004,
- + 0x0000C030,
- + 0x00000000,
- + 0x03000000,
- + 0x0000000C,
- + 0x00C0300C,
- 0x00000800,
- };
-
- @@ -170,14 +170,14 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0xA0000034,
- 0x0D000001,
- 0x6068030C,
- - 0xC7034018,
- - 0x0E381A01,
- + 0xCF034059,
- + 0x1E781A03,
- 0x8030C0D0,
- - 0x34018606,
- - 0x01A01C70,
- + 0x34059606,
- + 0x01A03CF0,
- 0x0C0D0000,
- - 0x18606803,
- - 0x01C70340,
- + 0x59606803,
- + 0x03CF0340,
- 0xD000001A,
- 0x068030C0,
- 0x10040000,
- @@ -244,15 +244,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0xA0000034,
- 0x0D000001,
- 0x6068030C,
- - 0xC7034018,
- - 0x0E381A01,
- + 0xCF034059,
- + 0x1E781A03,
- 0x8030C0D0,
- - 0x34018606,
- + 0x34059606,
- 0x01A00000,
- 0x0C0D0000,
- - 0x18606803,
- - 0x01C70340,
- - 0xD00E381A,
- + 0x59606803,
- + 0x03CF0340,
- + 0xD01E781A,
- 0x068030C0,
- 0x10040000,
- 0x00200000,
- @@ -273,7 +273,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0xAA0D4000,
- 0x01C3A810,
- 0xAA0D4000,
- - 0x01C3A808,
- + 0x01C3A810,
- 0xAA0D4000,
- 0x01C3A810,
- 0x00040100,
- @@ -301,7 +301,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x2A835000,
- 0x0070EA04,
- 0x2A835000,
- - 0x0070EA02,
- + 0x0070EA04,
- 0x2A835000,
- 0x0070EA04,
- 0x00010040,
- @@ -321,15 +321,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x14864000,
- 0x69A47A05,
- 0xCBCF23D7,
- - 0xF41E791E,
- - 0x034ED348,
- + 0xF5DE791E,
- + 0x0356D348,
- 0x821A0000,
- 0x0000D000,
- 0x01860680,
- 0xD769A47A,
- 0x1ECBCF23,
- - 0x48F41E79,
- - 0x00034ED3,
- + 0x48F5DE79,
- + 0x000356D3,
- 0x00080200,
- 0x00001000,
- 0x00080200,
- @@ -347,7 +347,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0xAA0D4000,
- 0x01C3A810,
- 0xAA0D4000,
- - 0x01C3A808,
- + 0x01C3A810,
- 0xAA0D4000,
- 0x01C3A810,
- 0x00040100,
- @@ -375,7 +375,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x2A835000,
- 0x0070EA04,
- 0x2A835000,
- - 0x0070EA02,
- + 0x0070EA04,
- 0x2A835000,
- 0x0070EA04,
- 0x00015000,
- @@ -395,15 +395,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x14864000,
- 0x69A47A05,
- 0xCBCF23D7,
- - 0xF41E791E,
- - 0x034ED348,
- - 0x821A00C3,
- + 0xF5DE791E,
- + 0x0356D348,
- + 0x821A02CB,
- 0x0000D000,
- 0x00000680,
- 0xD769A47A,
- 0x1ECBCF23,
- - 0x48F41E79,
- - 0x00034ED3,
- + 0x48F5DE79,
- + 0x000356D3,
- 0x00080200,
- 0x00001000,
- 0x00080200,
- @@ -421,7 +421,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0xAA0D4000,
- 0x01C3A810,
- 0xAA0D4000,
- - 0x01C3A808,
- + 0x01C3A810,
- 0xAA0D4000,
- 0x01C3A810,
- 0x00040100,
- @@ -449,7 +449,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x2A835000,
- 0x0070EA04,
- 0x2A835000,
- - 0x0070EA02,
- + 0x0070EA04,
- 0x2A835000,
- 0x0070EA04,
- 0x00010040,
- @@ -469,15 +469,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x14864000,
- 0x69A47A05,
- 0xCBCF23D7,
- - 0xF41E791E,
- - 0x034ED348,
- + 0xF5DE791E,
- + 0x0356D348,
- 0x821A0000,
- 0x0000D000,
- 0x00000680,
- 0xD769A47A,
- 0x1ECBCF23,
- - 0x48F41E79,
- - 0x00034ED3,
- + 0x48F5DE79,
- + 0x000356D3,
- 0x00080200,
- 0x00001000,
- 0x00080200,
- @@ -495,7 +495,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0xAA0D4000,
- 0x01C3A810,
- 0xAA0D4000,
- - 0x01C3A808,
- + 0x01C3A810,
- 0xAA0D4000,
- 0x01C3A810,
- 0x00040100,
- @@ -523,7 +523,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x2A835000,
- 0x0070EA04,
- 0x2A835000,
- - 0x0070EA02,
- + 0x0070EA04,
- 0x2A835000,
- 0x0070EA04,
- 0x00010040,
- @@ -543,15 +543,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x14864000,
- 0x69A47A05,
- 0xCBCF23D7,
- - 0xF41E791E,
- - 0x034ED348,
- + 0xF5DE791E,
- + 0x0356D348,
- 0x821A0000,
- 0x0000D000,
- 0x00000680,
- 0xD769A47A,
- 0x1ECBCF23,
- - 0x48F41E79,
- - 0x00034ED3,
- + 0x48F5DE79,
- + 0x000356D3,
- 0x00080200,
- 0x00001000,
- 0x00080200,
- @@ -567,80 +567,80 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 0x04000002,
- 0x00820000,
- 0x00489000,
- - 0x001A1A1A,
- - 0x085506A0,
- - 0x0000E1D4,
- - 0x045506A0,
- - 0x0000E1D4,
- - 0x085506A0,
- - 0x8000E1D4,
- + 0x801A1A1A,
- + 0x00000200,
- + 0x80000004,
- + 0x00000200,
- + 0x80000004,
- + 0x00000200,
- + 0x80000004,
- 0x00000200,
- 0x00000004,
- - 0x04000000,
- - 0x00000009,
- - 0x00002410,
- + 0x00040000,
- + 0x10000000,
- + 0x00000000,
- 0x00000040,
- - 0x41000000,
- - 0x00002082,
- - 0x00000350,
- - 0x000000DA,
- + 0x00010000,
- + 0x40002000,
- + 0x00000100,
- + 0x40000002,
- + 0x00000100,
- + 0x40000002,
- 0x00000100,
- 0x40000002,
- 0x00000100,
- 0x00000002,
- - 0x042A8350,
- - 0x000070EA,
- - 0x86000000,
- - 0x08000004,
- + 0x00020000,
- + 0x08000000,
- 0x00000000,
- - 0x00482000,
- - 0x21800000,
- - 0x00101061,
- - 0x021541A8,
- - 0x00003875,
- - 0x011541A8,
- - 0x00003875,
- - 0x021541A8,
- - 0x20003875,
- + 0x00000020,
- + 0x00008000,
- + 0x20001000,
- + 0x00000080,
- + 0x20000001,
- + 0x00000080,
- + 0x20000001,
- + 0x00000080,
- + 0x20000001,
- 0x00000080,
- 0x00000001,
- - 0x41000000,
- - 0x00000002,
- - 0x00FF0904,
- + 0x00010000,
- + 0x04000000,
- + 0x00FF0000,
- 0x00000000,
- - 0x90400000,
- - 0x00000820,
- + 0x00004000,
- + 0x00000800,
- 0x80000001,
- - 0x38D612AF,
- - 0x86F8E38E,
- - 0x0A0A78B4,
- - 0x000D020A,
- + 0x00041419,
- + 0x40000000,
- + 0x04000816,
- + 0x000D0000,
- 0x00006800,
- - 0x028A4320,
- - 0xEBB4D23D,
- - 0x8F65E791,
- - 0xA47A0F3C,
- - 0x0001A769,
- - 0x00410D00,
- + 0x00000340,
- + 0xD000001A,
- + 0x06800000,
- + 0x00340000,
- + 0x0001A000,
- + 0x00000D00,
- 0x40000068,
- - 0x3D000003,
- - 0x91EBB4D2,
- - 0x3C8F65E7,
- - 0x69A47A0F,
- - 0x000001A7,
- + 0x1A000003,
- + 0x00D00000,
- + 0x00068000,
- + 0x00003400,
- + 0x000001A0,
- + 0x00000401,
- + 0x00000008,
- 0x00000401,
- 0x00000008,
- 0x00000401,
- 0x00000008,
- - 0x00000540,
- - 0x000003A8,
- - 0x10AA0D40,
- - 0x8001C3A8,
- + 0x00000401,
- + 0x80000008,
- 0x0000007F,
- + 0x20000000,
- 0x00000000,
- - 0x00004060,
- - 0xE1208000,
- + 0xE0000080,
- 0x0000001F,
- - 0x00004100,
- + 0x00004000,
- };
-
- diff --git a/board/altera/socfpga_cyclone5/pinmux_config.c b/board/altera/socfpga_cyclone5/pinmux_config.c
- index 730067e..cfd74cd 100644
- --- a/board/altera/socfpga_cyclone5/pinmux_config.c
- +++ b/board/altera/socfpga_cyclone5/pinmux_config.c
- @@ -23,7 +23,7 @@ unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM] = {
- 0, /* EMACIO18 */
- 0, /* EMACIO19 */
- 3, /* FLASHIO0 */
- - 3, /* FLASHIO1 */
- + 0, /* FLASHIO1 */
- 3, /* FLASHIO2 */
- 3, /* FLASHIO3 */
- 0, /* FLASHIO4 */
- @@ -34,25 +34,25 @@ unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM] = {
- 3, /* FLASHIO9 */
- 3, /* FLASHIO10 */
- 3, /* FLASHIO11 */
- - 3, /* GENERALIO0 */
- - 3, /* GENERALIO1 */
- - 3, /* GENERALIO2 */
- - 3, /* GENERALIO3 */
- - 3, /* GENERALIO4 */
- - 3, /* GENERALIO5 */
- - 3, /* GENERALIO6 */
- - 3, /* GENERALIO7 */
- - 3, /* GENERALIO8 */
- + 0, /* GENERALIO0 */
- + 1, /* GENERALIO1 */
- + 1, /* GENERALIO2 */
- + 1, /* GENERALIO3 */
- + 1, /* GENERALIO4 */
- + 0, /* GENERALIO5 */
- + 0, /* GENERALIO6 */
- + 0, /* GENERALIO7 */
- + 0, /* GENERALIO8 */
- 3, /* GENERALIO9 */
- 3, /* GENERALIO10 */
- 3, /* GENERALIO11 */
- 3, /* GENERALIO12 */
- - 2, /* GENERALIO13 */
- - 2, /* GENERALIO14 */
- - 3, /* GENERALIO15 */
- - 3, /* GENERALIO16 */
- - 2, /* GENERALIO17 */
- - 2, /* GENERALIO18 */
- + 0, /* GENERALIO13 */
- + 0, /* GENERALIO14 */
- + 1, /* GENERALIO15 */
- + 1, /* GENERALIO16 */
- + 1, /* GENERALIO17 */
- + 1, /* GENERALIO18 */
- 0, /* GENERALIO19 */
- 0, /* GENERALIO20 */
- 0, /* GENERALIO21 */
- diff --git a/board/altera/socfpga_cyclone5/pinmux_config.h b/board/altera/socfpga_cyclone5/pinmux_config.h
- index fb483ab..64c750a 100644
- --- a/board/altera/socfpga_cyclone5/pinmux_config.h
- +++ b/board/altera/socfpga_cyclone5/pinmux_config.h
- @@ -11,15 +11,15 @@
- #define CONFIG_HPS_UART0 (1)
- #define CONFIG_HPS_UART1 (0)
- #define CONFIG_HPS_TRACE (0)
- -#define CONFIG_HPS_I2C0 (1)
- -#define CONFIG_HPS_I2C1 (0)
- +#define CONFIG_HPS_I2C0 (0)
- +#define CONFIG_HPS_I2C1 (1)
- #define CONFIG_HPS_I2C2 (0)
- #define CONFIG_HPS_I2C3 (0)
- #define CONFIG_HPS_SPIM0 (1)
- -#define CONFIG_HPS_SPIM1 (0)
- +#define CONFIG_HPS_SPIM1 (1)
- #define CONFIG_HPS_SPIS0 (0)
- #define CONFIG_HPS_SPIS1 (0)
- -#define CONFIG_HPS_CAN0 (1)
- +#define CONFIG_HPS_CAN0 (0)
- #define CONFIG_HPS_CAN1 (0)
-
- #define CONFIG_HPS_SDMMC_BUSWIDTH (4)
- diff --git a/board/altera/socfpga_cyclone5/sdram/sdram_config.h b/board/altera/socfpga_cyclone5/sdram/sdram_config.h
- index b90d6f3..dd027ef 100755
- --- a/board/altera/socfpga_cyclone5/sdram/sdram_config.h
- +++ b/board/altera/socfpga_cyclone5/sdram/sdram_config.h
- @@ -4,16 +4,16 @@
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE (2)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL (8)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER (0)
- -#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN (1)
- -#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN (1)
- +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN (0)
- +#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN (0)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN (1)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT (10)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN (0)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS (0)
- -#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL (6)
- +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL (8)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL (0)
- -#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL (7)
- -#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD (4)
- +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL (11)
- +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD (3)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW (12)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC (104)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI (3120)
- @@ -21,7 +21,7 @@
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP (6)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR (6)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR (4)
- -#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP (4)
- +#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP (3)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS (14)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC (20)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD (4)
- @@ -33,7 +33,7 @@
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS (15)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS (3)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS (1)
- -#define CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH (40)
- +#define CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH (32)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH (8)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN (0)
- #define CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL (2)
- diff --git a/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h b/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h
- index e8c5484..919676d 100644
- --- a/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h
- +++ b/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h
- @@ -34,7 +34,7 @@
- #define __RW_MGR_ac_read_en 0x21
- #define __RW_MGR_ac_mrs3_mirr 0x0C
- #define __RW_MGR_ac_mrs2 0x05
- -#define __RW_MGR_CONTENT_ac_mrs1 0x10090044
- +#define __RW_MGR_CONTENT_ac_mrs1 0x10090006
- #define __RW_MGR_CONTENT_ac_mrs3 0x100B0000
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_0_nodata_wl_1 0x18980000
- #define __RW_MGR_CONTENT_ac_act_1 0x106B0000
- @@ -46,8 +46,8 @@
- #define __RW_MGR_CONTENT_ac_init_reset_0_cke_0 0x20700000
- #define __RW_MGR_CONTENT_ac_read_bank_0_1_norden 0x10580008
- #define __RW_MGR_CONTENT_ac_pre_all 0x10280400
- -#define __RW_MGR_CONTENT_ac_mrs0_user 0x10080431
- -#define __RW_MGR_CONTENT_ac_mrs0_dll_reset 0x10080530
- +#define __RW_MGR_CONTENT_ac_mrs0_user 0x10080471
- +#define __RW_MGR_CONTENT_ac_mrs0_dll_reset 0x10080570
- #define __RW_MGR_CONTENT_ac_read_bank_0_0 0x13580000
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_1 0x1C980008
- #define __RW_MGR_CONTENT_ac_read_bank_0_1 0x13580008
- @@ -55,21 +55,21 @@
- #define __RW_MGR_CONTENT_ac_write_bank_1_col_1 0x1C9B0008
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_0 0x1C980000
- #define __RW_MGR_CONTENT_ac_read_bank_1_0 0x135B0000
- -#define __RW_MGR_CONTENT_ac_mrs1_mirr 0x100A0024
- +#define __RW_MGR_CONTENT_ac_mrs1_mirr 0x100A0006
- #define __RW_MGR_CONTENT_ac_read_bank_1_1 0x135B0008
- #define __RW_MGR_CONTENT_ac_des_odt_1 0x38780000
- -#define __RW_MGR_CONTENT_ac_mrs0_dll_reset_mirr 0x100804C8
- +#define __RW_MGR_CONTENT_ac_mrs0_dll_reset_mirr 0x100804E8
- #define __RW_MGR_CONTENT_ac_zqcl 0x10380400
- #define __RW_MGR_CONTENT_ac_write_predata 0x38F80000
- -#define __RW_MGR_CONTENT_ac_mrs0_user_mirr 0x10080449
- +#define __RW_MGR_CONTENT_ac_mrs0_user_mirr 0x10080469
- #define __RW_MGR_CONTENT_ac_ref 0x10480000
- #define __RW_MGR_CONTENT_ac_nop 0x30780000
- #define __RW_MGR_CONTENT_ac_rdimm 0x10780000
- -#define __RW_MGR_CONTENT_ac_mrs2_mirr 0x10090010
- +#define __RW_MGR_CONTENT_ac_mrs2_mirr 0x10090218
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_0_nodata 0x18180000
- #define __RW_MGR_CONTENT_ac_read_en 0x33780000
- #define __RW_MGR_CONTENT_ac_mrs3_mirr 0x100B0000
- -#define __RW_MGR_CONTENT_ac_mrs2 0x100A0008
- +#define __RW_MGR_CONTENT_ac_mrs2 0x100A0218
-
- #define __RW_MGR_READ_B2B_WAIT2 0x6A
- #define __RW_MGR_LFSR_WR_RD_BANK_0_WAIT 0x31
- diff --git a/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c b/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c
- index e16efa1..20b4ca1 100644
- --- a/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c
- +++ b/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c
- @@ -6,16 +6,16 @@ const alt_u32 ac_rom_init[36] =
- {
- 0x20700000,
- 0x20780000,
- - 0x10080431,
- - 0x10080530,
- - 0x10090044,
- - 0x100a0008,
- + 0x10080471,
- + 0x10080570,
- + 0x10090006,
- + 0x100a0218,
- 0x100b0000,
- 0x10380400,
- - 0x10080449,
- - 0x100804c8,
- - 0x100a0024,
- - 0x10090010,
- + 0x10080469,
- + 0x100804e8,
- + 0x100a0006,
- + 0x10090218,
- 0x100b0000,
- 0x30780000,
- 0x38780000,
- diff --git a/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h b/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h
- index 52faf3f..b85b85c 100644
- --- a/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h
- +++ b/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h
- @@ -1,28 +1,28 @@
- #ifndef _SEQUENCER_DEFINES_H_
- #define _SEQUENCER_DEFINES_H_
-
- -#define AC_ROM_MR1_MIRR 0000000100100
- +#define AC_ROM_MR1_MIRR 0000000000110
- #define AC_ROM_MR1_OCD_ENABLE
- -#define AC_ROM_MR2_MIRR 0000000010000
- +#define AC_ROM_MR2_MIRR 0001000011000
- #define AC_ROM_MR3_MIRR 0000000000000
- #define AC_ROM_MR0_CALIB
- -#define AC_ROM_MR0_DLL_RESET_MIRR 0010011001000
- -#define AC_ROM_MR0_DLL_RESET 0010100110000
- -#define AC_ROM_MR0_MIRR 0010001001001
- -#define AC_ROM_MR0 0010000110001
- -#define AC_ROM_MR1 0000001000100
- -#define AC_ROM_MR2 0000000001000
- +#define AC_ROM_MR0_DLL_RESET_MIRR 0010011101000
- +#define AC_ROM_MR0_DLL_RESET 0010101110000
- +#define AC_ROM_MR0_MIRR 0010001101001
- +#define AC_ROM_MR0 0010001110001
- +#define AC_ROM_MR1 0000000000110
- +#define AC_ROM_MR2 0001000011000
- #define AC_ROM_MR3 0000000000000
- #define AFI_CLK_FREQ 401
- #define AFI_RATE_RATIO 1
- #define ARRIAVGZ 0
- #define ARRIAV 0
- -#define AVL_CLK_FREQ 67
- +#define AVL_CLK_FREQ 81
- #define BFM_MODE 0
- #define BURST2 0
- #define CALIBRATE_BIT_SLIPS 0
- -#define CALIB_LFIFO_OFFSET 7
- -#define CALIB_VFIFO_OFFSET 5
- +#define CALIB_LFIFO_OFFSET 11
- +#define CALIB_VFIFO_OFFSET 9
- #define CYCLONEV 1
- #define DDR2 0
- #define DDR3 1
- @@ -89,20 +89,20 @@
- #define RW_MGR_MEM_CHIP_SELECT_WIDTH 1
- #define RW_MGR_MEM_CLK_EN_WIDTH 1
- #define RW_MGR_MEM_CONTROL_WIDTH 1
- -#define RW_MGR_MEM_DATA_MASK_WIDTH 5
- -#define RW_MGR_MEM_DATA_WIDTH 40
- +#define RW_MGR_MEM_DATA_MASK_WIDTH 4
- +#define RW_MGR_MEM_DATA_WIDTH 32
- #define RW_MGR_MEM_DQ_PER_READ_DQS 8
- #define RW_MGR_MEM_DQ_PER_WRITE_DQS 8
- -#define RW_MGR_MEM_IF_READ_DQS_WIDTH 5
- -#define RW_MGR_MEM_IF_WRITE_DQS_WIDTH 5
- +#define RW_MGR_MEM_IF_READ_DQS_WIDTH 4
- +#define RW_MGR_MEM_IF_WRITE_DQS_WIDTH 4
- #define RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM 1
- #define RW_MGR_MEM_NUMBER_OF_RANKS 1
- #define RW_MGR_MEM_ODT_WIDTH 1
- #define RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS 1
- #define RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS 1
- #define RW_MGR_MR0_BL 1
- -#define RW_MGR_MR0_CAS_LATENCY 3
- -#define RW_MGR_TRUE_MEM_DATA_MASK_WIDTH 5
- +#define RW_MGR_MR0_CAS_LATENCY 7
- +#define RW_MGR_TRUE_MEM_DATA_MASK_WIDTH 4
- #define RW_MGR_WRITE_TO_DEBUG_READ 1.0
- #define SKEW_CALIBRATION 0
- #define STATIC_FULL_CALIBRATION 1
- --
- 1.9.0
|