imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

[karo-tx-uboot.git] / cpu / mpc8220 / speed.c

diff --git a/cpu/mpc8220/speed.c b/cpu/mpc8220/speed.c
index 200a762711ec25c40a94eca8a1f1ea07835d5121..62ac845b7ae8f1aacfae45e623faa404eded5dbf 100755 (executable)
--- a/cpu/mpc8220/speed.c
+++ b/cpu/mpc8220/speed.c
@@ -67,25 +67,25 @@ int get_clocks (void)
        u32 hid1;
        int i, size, pci2bus;
 
-#if !defined(CFG_MPC8220_CLKIN)
-#error clock measuring not implemented yet - define CFG_MPC8220_CLKIN
+#if !defined(CONFIG_SYS_MPC8220_CLKIN)
+#error clock measuring not implemented yet - define CONFIG_SYS_MPC8220_CLKIN
 #endif
 
-       gd->inp_clk = CFG_MPC8220_CLKIN;
+       gd->inp_clk = CONFIG_SYS_MPC8220_CLKIN;
 
        /* Read XLB to PCI(INP) clock multiplier */
        pci2bus = (*((volatile u32 *)PCI_REG_PCIGSCR) &
                PCI_REG_PCIGSCR_PCI2XLB_CLK_MASK)>>PCI_REG_PCIGSCR_PCI2XLB_CLK_BIT;
 
        /* XLB bus clock */
-       gd->bus_clk = CFG_MPC8220_CLKIN * pci2bus;
+       gd->bus_clk = CONFIG_SYS_MPC8220_CLKIN * pci2bus;
 
        /* PCI clock is same as input clock */
-       gd->pci_clk = CFG_MPC8220_CLKIN;
+       gd->pci_clk = CONFIG_SYS_MPC8220_CLKIN;
 
        /* FlexBus is temporary set as the same as input clock */
        /* will do dynamic in the future */
-       gd->flb_clk = CFG_MPC8220_CLKIN;
+       gd->flb_clk = CONFIG_SYS_MPC8220_CLKIN;
 
        /* CPU Clock - Read HID1 */
        asm volatile ("mfspr %0, 1009":"=r" (hid1):);
@@ -97,7 +97,7 @@ int get_clocks (void)
        for (i = 0; i < size; i++)
                if (hid1 == bus2core[i].hid1) {
                        gd->cpu_clk = (bus2core[i].multi * gd->bus_clk) >> 1;
-                       gd->vco_clk = CFG_MPC8220_SYSPLL_VCO_MULTIPLIER * (gd->pci_clk * bus2core[i].vco_div)/2;
+                       gd->vco_clk = CONFIG_SYS_MPC8220_SYSPLL_VCO_MULTIPLIER * (gd->pci_clk * bus2core[i].vco_div)/2;
                        break;
                }
 
@@ -109,10 +109,14 @@ int get_clocks (void)
 
 int prt_mpc8220_clks (void)
 {
-       printf ("       Bus %ld MHz, CPU %ld MHz, PCI %ld MHz, VCO %ld MHz\n",
-               gd->bus_clk / 1000000, gd->cpu_clk / 1000000,
-               gd->pci_clk / 1000000, gd->vco_clk / 1000000);
-
+       char buf1[32], buf2[32], buf3[32], buf4[32];
+
+       printf ("       Bus %s MHz, CPU %s MHz, PCI %s MHz, VCO %s MHz\n",
+               strmhz(buf1, gd->bus_clk),
+               strmhz(buf2, gd->cpu_clk),
+               strmhz(buf3, gd->pci_clk),
+               strmhz(buf4, gd->vco_clk)
+       );
        return (0);
 }