mpc5xxx: Support CPU internal watchdog.

[oweals/u-boot.git] / cpu / mpc5xxx / speed.c

diff --git a/cpu/mpc5xxx/speed.c b/cpu/mpc5xxx/speed.c
index 4f4e814e94d64b3b18a070a819d4df1c982135b8..8027d3e08a2c8054a97bbcd00d0200389fccdfa0 100644 (file)
--- a/cpu/mpc5xxx/speed.c
+++ b/cpu/mpc5xxx/speed.c
@@ -25,6 +25,8 @@
 #include <mpc5xxx.h>
 #include <asm/processor.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* ------------------------------------------------------------------------- */
 
 /* Bus-to-Core Multipliers */
@@ -43,19 +45,17 @@ static int bus2core[] = {
 
 int get_clocks (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        ulong val, vco;
 
-#if !defined(CFG_MPC5XXX_CLKIN)
-#error clock measuring not implemented yet - define CFG_MPC5XXX_CLKIN
+#if !defined(CONFIG_SYS_MPC5XXX_CLKIN)
+#error clock measuring not implemented yet - define CONFIG_SYS_MPC5XXX_CLKIN
 #endif
 
        val = *(vu_long *)MPC5XXX_CDM_PORCFG;
        if (val & (1 << 6)) {
-               vco = CFG_MPC5XXX_CLKIN * 12;
+               vco = CONFIG_SYS_MPC5XXX_CLKIN * 12;
        } else {
-               vco = CFG_MPC5XXX_CLKIN * 16;
+               vco = CONFIG_SYS_MPC5XXX_CLKIN * 16;
        }
        if (val & (1 << 5)) {
                gd->bus_clk = vco / 8;
@@ -81,12 +81,13 @@ int get_clocks (void)
 
 int prt_mpc5xxx_clks (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       printf("       Bus %ld MHz, IPB %ld MHz, PCI %ld MHz\n",
-                       gd->bus_clk / 1000000, gd->ipb_clk / 1000000,
-                       gd->pci_clk / 1000000);
+       char buf1[32], buf2[32], buf3[32];
 
+       printf ("       Bus %s MHz, IPB %s MHz, PCI %s MHz\n",
+               strmhz(buf1, gd->bus_clk),
+               strmhz(buf2, gd->ipb_clk),
+               strmhz(buf3, gd->pci_clk)
+       );
        return (0);
 }