minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

Browse Source
This commit is contained in:
Wolfgang Denk 2009-11-15 22:48:02 +01:00
commit 7b18e8c90c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/mpc85xx/tlb.c
View File

@ -132,10 +132,10 @@ int find_tlb_idx(void *addr, u8 tlbsel)
void init_addr_map(void) void init_addr_map(void)
{ {
int i; int i;
unsigned int max_cam = (mfspr(SPRN_TLB1CFG) >> 16) & 0xff; unsigned int num_cam = mfspr(SPRN_TLB1CFG) & 0xfff;
/* walk all the entries */ /* walk all the entries */
for (i = 0; i < max_cam; i++) { for (i = 0; i < num_cam; i++) {
unsigned long epn; unsigned long epn;
u32 tsize, _mas1; u32 tsize, _mas1;
phys_addr_t rpn; phys_addr_t rpn;

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

@ -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);