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

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

diff --git a/cpu/mpc5xx/speed.c b/cpu/mpc5xx/speed.c
index 6a1fa155e298ab24db7322eb605007e54d35213a..ea5c1dead57214b55f293bc29bd184ca6ff6a1ae 100755 (executable)
--- a/cpu/mpc5xx/speed.c
+++ b/cpu/mpc5xx/speed.c
@@ -38,19 +38,19 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 int get_clocks (void)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
 
 #ifndef        CONFIG_5xx_GCLK_FREQ
        uint divf = (immr->im_clkrst.car_plprcr & PLPRCR_DIVF_MSK);
        uint mf = ((immr->im_clkrst.car_plprcr & PLPRCR_MF_MSK) >> PLPRCR_MF_SHIFT);
        ulong vcoout;
 
-       vcoout = (CFG_OSC_CLK / (divf + 1)) * (mf + 1) * 2;
+       vcoout = (CONFIG_SYS_OSC_CLK / (divf + 1)) * (mf + 1) * 2;
        if(immr->im_clkrst.car_plprcr & PLPRCR_CSRC_MSK) {
                gd->cpu_clk = vcoout / (2^(((immr->im_clkrst.car_sccr & SCCR_DFNL_MSK) >> SCCR_DFNL_SHIFT) + 1));
        } else {
-               gd->cpu_clk = vcoout / (2^(immr->im_clkrst.car_sccr & SCCR_DFNH_MSK));
-       }
+               gd->cpu_clk = vcoout / (2^(immr->im_clkrst.car_sccr & SCCR_DFNH_MSK));
+       }
 
 #else /* CONFIG_5xx_GCLK_FREQ */
        gd->bus_clk = CONFIG_5xx_GCLK_FREQ;