powerpc/mpc86xx: Fix boot_flag for calling board_init_f()

[oweals/u-boot.git] / arch / powerpc / cpu / ppc4xx / cpu.c

diff --git a/arch/powerpc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c
index fe050985e524c18720e0b9a8e216e6e45fd24299..d1fc7f3fc2ae789c7e1181b8cb68161c9c09e864 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/cpu.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu.c
@@ -320,25 +320,9 @@ int checkcpu (void)
                puts("405GP Rev. D");
                break;
 
-#ifdef CONFIG_405GP
-       case PVR_405GP_RE: /* 405GP rev E and 405CR rev C have same PVR */
+       case PVR_405GP_RE:
                puts("405GP Rev. E");
                break;
-#endif
-
-       case PVR_405CR_RA:
-               puts("405CR Rev. A");
-               break;
-
-       case PVR_405CR_RB:
-               puts("405CR Rev. B");
-               break;
-
-#ifdef CONFIG_405CR
-       case PVR_405CR_RC: /* 405GP rev E and 405CR rev C have same PVR */
-               puts("405CR Rev. C");
-               break;
-#endif
 
        case PVR_405GPR_RB:
                puts("405GPr Rev. B");
@@ -647,12 +631,12 @@ int checkcpu (void)
 #endif
 
 #if defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX)
-       printf ("       16 kB I-Cache 16 kB D-Cache");
+       printf("       16 KiB I-Cache 16 KiB D-Cache");
 #elif defined(CONFIG_440)
-       printf ("       32 kB I-Cache 32 kB D-Cache");
+       printf("       32 KiB I-Cache 32 KiB D-Cache");
 #else
-       printf ("       16 kB I-Cache %d kB D-Cache",
-               ((pvr | 0x00000001) == PVR_405GPR_RB) ? 16 : 8);
+       printf("       16 KiB I-Cache %d KiB D-Cache",
+              ((pvr | 0x00000001) == PVR_405GPR_RB) ? 16 : 8);
 #endif
 
 #endif /* !defined(CONFIG_405) */