Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

[u-boot] / cpu / 74xx_7xx / cpu.c

diff --git a/cpu/74xx_7xx/cpu.c b/cpu/74xx_7xx/cpu.c
index fc3b09217f7272778de9664505d7ab072f490da4..9c8998b604e1404469574f420bc514ecffdf0555 100644 (file)
--- a/cpu/74xx_7xx/cpu.c
+++ b/cpu/74xx_7xx/cpu.c
@@ -108,11 +108,11 @@ get_cpu_type(void)
        case 0x8003:
                type = CPU_7447A;
                break;
-               
+
        case 0x8004:
                type = CPU_7448;
                break;
-               
+
        default:
                break;
        }
@@ -164,6 +164,14 @@ int checkcpu (void)
                str = "MPC7410";
                break;
 
+       case CPU_7447A:
+               str = "MPC7447A";
+               break;
+
+       case CPU_7448:
+               str = "MPC7448";
+               break;
+
        case CPU_7450:
                str = "MPC7450";
                break;
@@ -176,14 +184,6 @@ int checkcpu (void)
                str = "MPC7457";
                break;
 
-       case CPU_7447A:
-               str = "MPC7447A";
-               break;
-
-       case CPU_7448:
-               str = "MPC7448";
-               break;
-
        default:
                printf("Unknown CPU -- PVR: 0x%08x\n", pvr);
                return -1;
@@ -241,7 +241,7 @@ soft_restart(unsigned long addr)
 void
 do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
-       ulong addr;
+       ulong addr;
        /* flush and disable I/D cache */
        __asm__ __volatile__ ("mfspr    3, 1008"        ::: "r3");
        __asm__ __volatile__ ("ori      5, 5, 0xcc00"   ::: "r5");
@@ -308,9 +308,9 @@ ft_cpu_setup (void *blob, bd_t *bd)
        u32 *p;
        ulong clock;
        int len;
-               
+
        clock = bd->bi_busfreq;
-       
+
        p = ft_get_prop (blob, "/cpus/" OF_CPU "/bus-frequency", &len);
        if (p != NULL)
                *p = cpu_to_be32 (clock);