diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-05 00:17:16 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-05 00:17:16 +0100 |
| commit | 762bd90cbb6536d2c8451c13fe23552f3311f860 (patch) | |
| tree | 12421c51ac7f71f6e1591a60e81988fe06777304 /cpu/mpc8xxx/ddr/main.c | |
| parent | 6226db68af76bec165bfdfd04ef52d9a54345917 (diff) | |
| parent | dc889e865356497d3e495570118c2245ebce2631 (diff) | |
| download | olio-uboot-2014.01-762bd90cbb6536d2c8451c13fe23552f3311f860.tar.xz olio-uboot-2014.01-762bd90cbb6536d2c8451c13fe23552f3311f860.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'cpu/mpc8xxx/ddr/main.c')
| -rw-r--r-- | cpu/mpc8xxx/ddr/main.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpu/mpc8xxx/ddr/main.c b/cpu/mpc8xxx/ddr/main.c index 21a16d97e..f1ad13286 100644 --- a/cpu/mpc8xxx/ddr/main.c +++ b/cpu/mpc8xxx/ddr/main.c @@ -475,9 +475,14 @@ phys_size_t fsl_ddr_sdram(void) */ memctl_interleaved = 1; } else { - printf("Error: memctl interleaving not " + printf("Warning: memctl interleaving not " "properly configured on all controllers\n"); - while (1); + memctl_interleaved = 0; + for (i = 0; i < CONFIG_NUM_DDR_CONTROLLERS; i++) + info.memctl_opts[i].memctl_interleaving = 0; + debug("Recomputing with memctl_interleaving off.\n"); + total_memory = fsl_ddr_compute(&info, + STEP_ASSIGN_ADDRESSES); } } |