From: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Date: Thu, 3 Sep 2009 14:12:40 +0000 (+0530)
Subject: ppc/85xx/86xx: Bug fix: call to puts in probecpu() moved to checkcpu().
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=21170c80a83f1e60ce7f6f83005e06a5c2d15a8e;p=project%2Fbcm63xx%2Fu-boot.git

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>
---

diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index 63bdb6fde1..8b3810f5b0 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -61,6 +61,10 @@ int checkcpu (void)
 	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 {
diff --git a/cpu/mpc86xx/cpu.c b/cpu/mpc86xx/cpu.c
index e97ab6d8a5..f7e012db57 100644
--- a/cpu/mpc86xx/cpu.c
+++ b/cpu/mpc86xx/cpu.c
@@ -61,6 +61,12 @@ checkcpu(void)
 	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;
diff --git a/cpu/mpc8xxx/cpu.c b/cpu/mpc8xxx/cpu.c
index c73ac3cc6d..00791e11bd 100644
--- a/cpu/mpc8xxx/cpu.c
+++ b/cpu/mpc8xxx/cpu.c
@@ -107,12 +107,6 @@ int probecpu (void)
 
 	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;
 }