diff options
| author | Andy Fleming <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-10-19 11:24:22 -0500 |
| commit | d4d1e9bee7c45ea8c513d3af697c864107f1c4d1 (patch) | |
| tree | 3cd7eba359e6729454f4fac5b96209eb959ecf72 /cpu/mcf532x | |
| parent | 1487adbdcf9594bb2eb686325a6f9540dad1b70a (diff) | |
| parent | 27d2b1ed216b457a66c17d38ce5ffdf3c2c32d1e (diff) | |
| download | u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.zip u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.tar.gz u-boot-imx-d4d1e9bee7c45ea8c513d3af697c864107f1c4d1.tar.bz2 | |
Merge branch 'denx'
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); |