mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-21 14:41:31 +00:00
fsl-ddr: ignore memctl_intlv_ctl setting if only one DDR controller
If we only have one controller we can completely ignore how memctl_intlv_ctl is set. Otherwise other levels of code get confused and think we have twice as much memory. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
b29dee3c90
commit
1542fbdeec
1 changed files with 4 additions and 0 deletions
|
@ -22,7 +22,9 @@ 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. */
|
||||||
|
|
||||||
|
@ -195,6 +197,7 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
|
||||||
* requested ranks interleaved together such that the result
|
* requested ranks interleaved together such that the result
|
||||||
* should be a subset of the requested configuration.
|
* should be a subset of the requested configuration.
|
||||||
*/
|
*/
|
||||||
|
#if (CONFIG_NUM_DDR_CONTROLLERS > 1)
|
||||||
if ((p = getenv("memctl_intlv_ctl")) != NULL) {
|
if ((p = getenv("memctl_intlv_ctl")) != NULL) {
|
||||||
if (pdimm[0].n_ranks == 0) {
|
if (pdimm[0].n_ranks == 0) {
|
||||||
printf("There is no rank on CS0. Because only rank on "
|
printf("There is no rank on CS0. Because only rank on "
|
||||||
|
@ -262,6 +265,7 @@ 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…
Add table
Reference in a new issue