GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 01:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Wolfgang Denk 2008-04-13 09:38:13 -07:00
commit 643de569b2
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/mpc85xx/cpu_init.c
View file

@ -272,7 +272,7 @@ int cpu_init_r(void)
uint l2srbar; uint l2srbar;
svr = get_svr(); svr = get_svr();
ver = SVR_VER(svr); ver = SVR_SOC_VER(svr);
asm("msync;isync"); asm("msync;isync");
cache_ctl = l2cache->l2ctl; cache_ctl = l2cache->l2ctl;

6
cpu/mpc85xx/mp.c
View file

@ -154,7 +154,7 @@ static void pq3_mp_up(unsigned long bootpg)
while (timeout) { while (timeout) {
int i; int i;
for (i = 1; i < CONFIG_NR_CPUS; i++) { for (i = 1; i < CONFIG_NR_CPUS; i++) {
if (table[i * NUM_BOOT_ENTRY]) if (table[i * NUM_BOOT_ENTRY + BOOT_ENTRY_ADDR_LOWER])
cpu_up_mask |= (1 << i); cpu_up_mask |= (1 << i);
}; };
@ -165,6 +165,10 @@ static void pq3_mp_up(unsigned long bootpg)
timeout--; timeout--;
} }
if (timeout == 0)
printf("CPU up timeout. CPU up mask is %x should be %x\n",
cpu_up_mask, up);
/* enable time base at the platform */ /* enable time base at the platform */
if (whoami) if (whoami)
devdisr |= MPC85xx_DEVDISR_TB1; devdisr |= MPC85xx_DEVDISR_TB1;

2
cpu/mpc85xx/spd_sdram.c
View file

@ -306,7 +306,7 @@ spd_sdram(void)
* Adjust DDR II IO voltage biasing. * Adjust DDR II IO voltage biasing.
* Only 8548 rev 1 needs the fix * Only 8548 rev 1 needs the fix
*/ */
if ((SVR_VER(get_svr()) == SVR_8548_E) && if ((SVR_SOC_VER(get_svr()) == SVR_8548_E) &&
(SVR_MJREV(get_svr()) == 1) && (SVR_MJREV(get_svr()) == 1) &&
(spd.mem_type == SPD_MEMTYPE_DDR2)) { (spd.mem_type == SPD_MEMTYPE_DDR2)) {
volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);