Merge branch 'next'

[platform/kernel/u-boot.git] / arch / powerpc / cpu / mpc85xx / cpu.c

diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c
index cd32290..ba9736e 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/cpu.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu.c
@@ -143,8 +143,10 @@ int checkcpu (void)
        printf("Core:  ");
        switch(ver) {
        case PVR_VER_E500_V1:
+               puts("e500v1");
+               break;
        case PVR_VER_E500_V2:
-               puts("e500");
+               puts("e500v2");
                break;
        case PVR_VER_E500MC:
                puts("e500mc");
@@ -241,10 +243,6 @@ int checkcpu (void)
        printf("IFC:%-4s MHz\n", strmhz(buf1, sysinfo.freq_localbus));
 #endif
 
-#ifdef CONFIG_CPM2
-       printf("CPM:   %s MHz\n", strmhz(buf1, sysinfo.freq_systembus));
-#endif
-
 #ifdef CONFIG_QE
        printf("       QE:%-4s MHz\n", strmhz(buf1, sysinfo.freq_qe));
 #endif
@@ -346,6 +344,7 @@ __weak unsigned long get_tbclk(void)
 }
 
 
+#ifndef CONFIG_WDT
 #if defined(CONFIG_WATCHDOG)
 #define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)
 void
@@ -374,6 +373,7 @@ watchdog_reset(void)
                enable_interrupts();
 }
 #endif /* CONFIG_WATCHDOG */
+#endif
 
 /*
  * Initializes on-chip MMC controllers.