ppc/85xx/86xx: Bug fix: call to puts in probecpu() moved to checkcpu().

While in probecpu() UART is still not initialized.

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Poonam Aggrwal 2009-09-03 19:42:40 +05:30 committed by Tom Rix
parent ef4025cf61
commit 6946086859
3 changed files with 10 additions and 6 deletions

View file

@ -61,6 +61,10 @@ int checkcpu (void)
minor = SVR_MIN(svr); minor = SVR_MIN(svr);
if (cpu_numcores() > 1) { if (cpu_numcores() > 1) {
#ifndef CONFIG_MP
puts("Unicore software on multiprocessor system!!\n"
"To enable mutlticore build define CONFIG_MP\n");
#endif
volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR); volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
printf("CPU%d: ", pic->whoami); printf("CPU%d: ", pic->whoami);
} else { } else {

View file

@ -61,6 +61,12 @@ checkcpu(void)
major = SVR_MAJ(svr); major = SVR_MAJ(svr);
minor = SVR_MIN(svr); minor = SVR_MIN(svr);
if (cpu_numcores() > 1) {
#ifndef CONFIG_MP
puts("Unicore software on multiprocessor system!!\n"
"To enable mutlticore build define CONFIG_MP\n");
#endif
}
puts("CPU: "); puts("CPU: ");
cpu = gd->cpu; cpu = gd->cpu;

View file

@ -107,12 +107,6 @@ int probecpu (void)
gd->cpu = identify_cpu(ver); gd->cpu = identify_cpu(ver);
#ifndef CONFIG_MP
if (cpu_numcores() > 1) {
puts("Unicore software on multiprocessor system!!\n"
"To enable mutlticore build define CONFIG_MP\n");
}
#endif
return 0; return 0;
} }