X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fmpc8260%2Fcpu.c;h=4f23012b729420ba74ce64dc4cb65d24cb73385e;hb=b86d7622b33892b1dafe761a7a9eaeeab9f3816b;hp=a34386f7c2c278de3bd04193c5de3ca8eb520d10;hpb=ba91e26a1923dfc703d4b96ae9428067b7447ff2;p=oweals%2Fu-boot.git diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index a34386f7c2..4f23012b72 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2003 + * (C) Copyright 2000-2006 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -47,10 +47,10 @@ #include #include +DECLARE_GLOBAL_DATA_PTR; + int checkcpu (void) { - DECLARE_GLOBAL_DATA_PTR; - volatile immap_t *immap = (immap_t *) CFG_IMMR; ulong clock = gd->cpu_clk; uint pvr = get_pvr (); @@ -137,13 +137,13 @@ int checkcpu (void) puts ("0.0 0K50M"); break; case 0x0C10: - puts ("1.0 0K50M"); + puts ("1.0 1K50M"); break; case 0x0D00: puts ("0.0 0K50M"); break; case 0x0D10: - puts ("1.0 0K50M"); + puts ("1.0 1K50M"); break; default: printf ("unknown [immr=0x%04x,k=0x%04x]", m, k); @@ -264,8 +264,6 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) */ unsigned long get_tbclk (void) { - DECLARE_GLOBAL_DATA_PTR; - ulong tbclk; tbclk = (gd->bus_clk + 3L) / 4L;