ppc4xx: Fix problem with ECC ordering for PPC4xx NDFC platforms

[oweals/u-boot.git] / cpu / mcf523x / cpu.c

diff --git a/cpu/mcf523x/cpu.c b/cpu/mcf523x/cpu.c
index bdc152f07824ad83e5ad216d60bc9287942eb8f1..a1a51336c23f765a2e3a3292407a6d1ee922c79d 100644 (file)
--- a/cpu/mcf523x/cpu.c
+++ b/cpu/mcf523x/cpu.c
@@ -60,11 +60,13 @@ int checkcpu(void)
        }
 
        if (id) {
+               char buf1[32], buf2[32];
+
                printf("Freescale MCF%d (Mask:%01x Version:%x)\n", id, msk,
                       ver);
-               printf("       CPU CLK %d Mhz BUS CLK %d Mhz\n",
-                      (int)(gd->cpu_clk / 1000000),
-                      (int)(gd->bus_clk / 1000000));
+               printf("       CPU CLK %s MHz BUS CLK %s MHz\n",
+                      strmhz(buf1, gd->cpu_clk),
+                      strmhz(buf2, gd->bus_clk));
        }
 
        return 0;
@@ -98,7 +100,7 @@ int watchdog_init(void)
        u32 wdog_module = 0;
 
        /* set timeout and enable watchdog */
-       wdog_module = ((CFG_CLK / CFG_HZ) * CONFIG_WATCHDOG_TIMEOUT);
+       wdog_module = ((CONFIG_SYS_CLK / CONFIG_SYS_HZ) * CONFIG_WATCHDOG_TIMEOUT);
        wdog_module |= (wdog_module / 8192);
        wdp->mr = wdog_module;