Changed CFG_CLK to gd->bus_clk for CFG_TIMER_PRESCALER. Added DECLARE_GLOBAL_DATA_PTR...

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>

diff --git a/include/asm-m68k/immap.h b/include/asm-m68k/immap.h
index 4e238c3f5404df56c94e1f7697df922e71fdf797..7c267af56eaa7da5e6dd9875bf17f8310a9eecdd 100644 (file)
--- a/include/asm-m68k/immap.h
+++ b/include/asm-m68k/immap.h
@@ -41,7 +41,7 @@
 #define CFG_TMRINTR_NO         (INT0_HI_DTMR1)
 #define CFG_TMRINTR_MASK       (INTC_IPRH_INT33)
 #define CFG_TMRINTR_PRI                (6)
-#define CFG_TIMER_PRESCALER    (((CFG_CLK / 1000000) - 1) << 8)
+#define CFG_TIMER_PRESCALER    (((gd->bus_clk / 1000000) - 1) << 8)
 #endif
 
 #ifdef CONFIG_MCFPIT

diff --git a/lib_m68k/time.c b/lib_m68k/time.c
index 267a3cdbc78253a1f6a290b77e97786af287e4a3..3dbce07213ef27db06ed98e937bedf4f37b4be22 100644 (file)
--- a/lib_m68k/time.c
+++ b/lib_m68k/time.c
@@ -48,6 +48,8 @@
 #include <asm/immap_5249.h>
 #endif
 
+DECLARE_GLOBAL_DATA_PTR;
+
 static ulong timestamp;
 #if defined(CONFIG_M5282) || defined(CONFIG_M5271)
 static unsigned short lastinc;