diff options
| author | Peter Pearse <peter.pearse@arm.com> | 2007-09-18 11:12:58 +0100 |
|---|---|---|
| committer | Peter Pearse <peter.pearse@arm.com> | 2007-09-18 11:12:58 +0100 |
| commit | afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8 (patch) | |
| tree | 4b0d37a727b3ede6540825258cc930533c0cdce7 /cpu/mcf532x | |
| parent | d94c79e47011af5e8dd10ed6163c09b4cfc743cc (diff) | |
| parent | 67c31036acaaaa992fc346cc89db0909a7e733c4 (diff) | |
| download | u-boot-imx-afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8.zip u-boot-imx-afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8.tar.gz u-boot-imx-afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'cpu/mcf532x')
| -rw-r--r-- | cpu/mcf532x/cpu.c | 4 | ||||
| -rw-r--r-- | cpu/mcf532x/speed.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpu/mcf532x/cpu.c b/cpu/mcf532x/cpu.c index 520f5d6..2f62e95 100644 --- a/cpu/mcf532x/cpu.c +++ b/cpu/mcf532x/cpu.c @@ -31,6 +31,8 @@ #include <asm/immap.h> +DECLARE_GLOBAL_DATA_PTR; + int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[]) { volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG); @@ -48,8 +50,6 @@ int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char *argv[]) int checkcpu(void) { - DECLARE_GLOBAL_DATA_PTR; - volatile ccm_t *ccm = (ccm_t *) MMAP_CCM; u16 msk; u16 id = 0; diff --git a/cpu/mcf532x/speed.c b/cpu/mcf532x/speed.c index cf72609..001b9f4 100644 --- a/cpu/mcf532x/speed.c +++ b/cpu/mcf532x/speed.c @@ -30,6 +30,8 @@ #include <asm/immap.h> +DECLARE_GLOBAL_DATA_PTR; + /* PLL min/max specifications */ #define MAX_FVCO 500000 /* KHz */ #define MAX_FSYS 80000 /* KHz */ @@ -208,8 +210,6 @@ int clock_pll(int fsys, int flags) */ int get_clocks(void) { - DECLARE_GLOBAL_DATA_PTR; - gd->bus_clk = clock_pll(CFG_CLK / 1000, 0) * 1000; gd->cpu_clk = (gd->bus_clk * 3); return (0); |