commit 69460868594f2d593774fe82c3b0db19d4a178cb
author Poonam Aggrwal <poonam.aggrwal@freescale.com> Thu Sep 03 19:42:40 2009 +0530
committer Tom Rix <Tom.Rix@windriver.com> Sat Oct 03 09:04:17 2009 -0500
tree af9cfcdc8e02cccf99dc4c56c5e5b2bd35583c04
parent ef4025cf61f0bd002d5e5be912b6606cbe48e66c

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>

cpu/mpc85xx/cpu.c

diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index 63bdb6f..8b3810f 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -61,6 +61,10 @@
 	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
 		volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC85xx_PIC_ADDR);
 		printf("CPU%d:  ", pic->whoami);
 	} else {

cpu/mpc86xx/cpu.c

diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c
index e97ab6d..f7e012d 100644
--- a/cpu/mpc86xx/cpu.c
+++ b/cpu/mpc86xx/cpu.c
@@ -61,6 +61,12 @@
 	major = SVR_MAJ(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:   ");
 
 	cpu = gd->cpu;

cpu/mpc8xxx/cpu.c

diff --git a/cpu/mpc8xxx/cpu.c b/cpu/mpc8xxx/cpu.c
index c73ac3c..00791e1 100644
--- a/cpu/mpc8xxx/cpu.c
+++ b/cpu/mpc8xxx/cpu.c
@@ -107,12 +107,6 @@
 
 	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;
 }