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 63bdb6fde1da1ffc85d1e6ae383fed86e6542d5d..8b3810f5b00f64705dcd1688b49a4341b9271308 100644 (file)
--- 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 e97ab6d8a5b4c9f8543986c701caccbc29743353..f7e012db573cc0f795291f32dd3b2b9fae0c89c3 100644 (file)
--- 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 c73ac3cc6d247f62bb8e91b3a3ca13711cf87b74..00791e11bd53790edf567a358ef50b48873ede84 100644 (file)
--- 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;
 }