mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-09-13 22:16:45 -04:00
fsl-ddr: Fix the chip-select interleaving issue
commit 1542fbdeec0d1e2a6df13189df8dcb1ce8802be3 introduced one new bug to chip-select interleaving. Single DDR controller also can do the chip-select interleaving if there is dual-rank or qual-rank DIMMs. Signed-off-by: Dave Liu <daveliu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
4f127980e0
commit
3ad95deb30
@ -22,9 +22,7 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
|
|||||||
unsigned int ctrl_num)
|
unsigned int ctrl_num)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
#if (CONFIG_NUM_DDR_CONTROLLERS > 1)
|
|
||||||
const char *p;
|
const char *p;
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Chip select options. */
|
/* Chip select options. */
|
||||||
|
|
||||||
@ -242,8 +240,10 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
|
|||||||
simple_strtoul(p, NULL, 0);
|
simple_strtoul(p, NULL, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if( (p = getenv("ba_intlv_ctl")) != NULL) {
|
if( ((p = getenv("ba_intlv_ctl")) != NULL) &&
|
||||||
|
(CONFIG_CHIP_SELECTS_PER_CTRL > 1)) {
|
||||||
if (strcmp(p, "cs0_cs1") == 0)
|
if (strcmp(p, "cs0_cs1") == 0)
|
||||||
popts->ba_intlv_ctl = FSL_DDR_CS0_CS1;
|
popts->ba_intlv_ctl = FSL_DDR_CS0_CS1;
|
||||||
else if (strcmp(p, "cs2_cs3") == 0)
|
else if (strcmp(p, "cs2_cs3") == 0)
|
||||||
@ -283,7 +283,6 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
fsl_ddr_board_options(popts, pdimm, ctrl_num);
|
fsl_ddr_board_options(popts, pdimm, ctrl_num);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user