minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-08-23 05:36:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fsl ddr skip interleaving if not supported.

Browse Source 
Removed while(1) hang if memctl_intlv_ctl is set wrong.
Remove embedded tabs from strings.

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
Ed Swarthout 2008-10-29 09:21:44 -05:00 committed by Andrew Fleming-AFLEMING
parent dd332e18d0
commit 7008d26a40
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpu/mpc8xxx/ddr/main.c
View File

@ -475,9 +475,14 @@ phys_size_t fsl_ddr_sdram(void)
*/ */
memctl_interleaved = 1; memctl_interleaved = 1;
} else { } else {
printf("Error: memctl interleaving not " printf("Warning: memctl interleaving not "
"properly configured on all controllers\n"); "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);
} }
} }

20
cpu/mpc8xxx/ddr/options.c
View File

@ -197,10 +197,10 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
*/ */
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 "
CS0 and ranks chip-select interleaved with CS0\ "CS0 and ranks chip-select interleaved with CS0"
are controller interleaved, force non memory \ " are controller interleaved, force non memory "
controller interleaving\n"); "controller interleaving\n");
popts->memctl_interleaving = 0; popts->memctl_interleaving = 0;
} else { } else {
popts->memctl_interleaving = 1; popts->memctl_interleaving = 1;
@ -239,22 +239,22 @@ unsigned int populate_memctl_options(int all_DIMMs_registered,
case FSL_DDR_CS0_CS1: case FSL_DDR_CS0_CS1:
if (pdimm[0].n_ranks != 2) { if (pdimm[0].n_ranks != 2) {
popts->ba_intlv_ctl = 0; popts->ba_intlv_ctl = 0;
printf("No enough bank(chip-select) for \ printf("Not enough bank(chip-select) for "
CS0+CS1, force non-interleaving!\n"); "CS0+CS1, force non-interleaving!\n");
} }
break; break;
case FSL_DDR_CS2_CS3: case FSL_DDR_CS2_CS3:
if (pdimm[1].n_ranks !=2){ if (pdimm[1].n_ranks !=2){
popts->ba_intlv_ctl = 0; popts->ba_intlv_ctl = 0;
printf("No enough bank(CS) for CS2+CS3, \ printf("Not enough bank(CS) for CS2+CS3, "
force non-interleaving!\n"); "force non-interleaving!\n");
} }
break; break;
case FSL_DDR_CS0_CS1_AND_CS2_CS3: case FSL_DDR_CS0_CS1_AND_CS2_CS3:
if ((pdimm[0].n_ranks != 2)||(pdimm[1].n_ranks != 2)) { if ((pdimm[0].n_ranks != 2)||(pdimm[1].n_ranks != 2)) {
popts->ba_intlv_ctl = 0; popts->ba_intlv_ctl = 0;
printf("No enough bank(CS) for CS0+CS1 or \ printf("Not enough bank(CS) for CS0+CS1 or "
CS2+CS3, force non-interleaving!\n"); "CS2+CS3, force non-interleaving!\n");
} }
break; break;
default: default: