diff options
| author | TsiChungLiew <Tsi-Chung.Liew@freescale.com> | 2007-08-05 03:58:52 -0500 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-08 09:47:31 +0200 |
| commit | 99c03c175d2689093176facf17c58ce2cb320001 (patch) | |
| tree | cbb00ece6bb86e86f8c5c328a16c9adce4fac4c6 | |
| parent | 8d1d66af54d305de29d0bbf4aa8c9e6375f7f731 (diff) | |
Changed CFG_CLK to gd->bus_clk for CFG_TIMER_PRESCALER. Added DECLARE_GLOBAL_DATA_PTR for time.c
Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>
| -rw-r--r-- | include/asm-m68k/immap.h | 2 | ||||
| -rw-r--r-- | lib_m68k/time.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-m68k/immap.h b/include/asm-m68k/immap.h index 4e238c3f5..7c267af56 100644 --- 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 267a3cdbc..3dbce0721 100644 --- 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; |