diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2009-02-06 09:56:34 -0600 |
|---|---|---|
| committer | Andy Fleming <afleming@freescale.com> | 2009-02-16 18:05:50 -0600 |
| commit | 1542fbdeec0d1e2a6df13189df8dcb1ce8802be3 (patch) | |
| tree | 32fb15177459b12a5947bf700d547077840f85f5 | |
| parent | b29dee3c906e9daaf6baf7772d2e15e26b8636b8 (diff) | |
| download | u-boot-imx-1542fbdeec0d1e2a6df13189df8dcb1ce8802be3.zip u-boot-imx-1542fbdeec0d1e2a6df13189df8dcb1ce8802be3.tar.gz u-boot-imx-1542fbdeec0d1e2a6df13189df8dcb1ce8802be3.tar.bz2 | |
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>
| -rw-r--r-- | cpu/mpc8xxx/ddr/options.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cpu/mpc8xxx/ddr/options.c b/cpu/mpc8xxx/ddr/options.c index d4702d7..29d4143 100644 --- a/cpu/mpc8xxx/ddr/options.c +++ b/cpu/mpc8xxx/ddr/options.c @@ -22,7 +22,9 @@ unsigned int populate_memctl_options(int all_DIMMs_registered, unsigned int ctrl_num) { unsigned int i; +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) const char *p; +#endif /* Chip select options. */ @@ -195,6 +197,7 @@ unsigned int populate_memctl_options(int all_DIMMs_registered, * requested ranks interleaved together such that the result * should be a subset of the requested configuration. */ +#if (CONFIG_NUM_DDR_CONTROLLERS > 1) if ((p = getenv("memctl_intlv_ctl")) != NULL) { if (pdimm[0].n_ranks == 0) { 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; } } +#endif fsl_ddr_board_options(popts, pdimm, ctrl_num); |