diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-09-24 00:04:22 +0200 |
| commit | 6b6f287a33ae8c340f97fb08ed95b6687e2baa4b (patch) | |
| tree | 57d0aa201f36c6dd5a43efd23a0ee2ded95440ba /cpu/mpc86xx | |
| parent | d45963854eff39d575124d859419bb4953ce2c87 (diff) | |
| parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
| download | u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.zip u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.gz u-boot-imx-6b6f287a33ae8c340f97fb08ed95b6687e2baa4b.tar.bz2 | |
Merge ../u-boot
Diffstat (limited to 'cpu/mpc86xx')
| -rw-r--r-- | cpu/mpc86xx/cpu_init.c | 3 | ||||
| -rw-r--r-- | cpu/mpc86xx/speed.c | 2 | ||||
| -rw-r--r-- | cpu/mpc86xx/traps.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/cpu/mpc86xx/cpu_init.c b/cpu/mpc86xx/cpu_init.c index c8e4666..4f8956e 100644 --- a/cpu/mpc86xx/cpu_init.c +++ b/cpu/mpc86xx/cpu_init.c @@ -29,6 +29,8 @@ #include <common.h> #include <mpc86xx.h> +DECLARE_GLOBAL_DATA_PTR; + /* * Breathe some life into the CPU... * @@ -38,7 +40,6 @@ void cpu_init_f(void) { - DECLARE_GLOBAL_DATA_PTR; volatile immap_t *immap = (immap_t *)CFG_IMMR; volatile ccsr_lbc_t *memctl = &immap->im_lbc; diff --git a/cpu/mpc86xx/speed.c b/cpu/mpc86xx/speed.c index 312ca12..23161ca 100644 --- a/cpu/mpc86xx/speed.c +++ b/cpu/mpc86xx/speed.c @@ -29,6 +29,7 @@ #include <mpc86xx.h> #include <asm/processor.h> +DECLARE_GLOBAL_DATA_PTR; void get_sys_info(sys_info_t *sysInfo) { @@ -96,7 +97,6 @@ void get_sys_info(sys_info_t *sysInfo) int get_clocks(void) { - DECLARE_GLOBAL_DATA_PTR; sys_info_t sys_info; get_sys_info(&sys_info); diff --git a/cpu/mpc86xx/traps.c b/cpu/mpc86xx/traps.c index c84bfbf..04c2e13 100644 --- a/cpu/mpc86xx/traps.c +++ b/cpu/mpc86xx/traps.c @@ -34,6 +34,8 @@ #include <command.h> #include <asm/processor.h> +DECLARE_GLOBAL_DATA_PTR; + #if defined(CONFIG_CMD_KGDB) int (*debugger_exception_handler)(struct pt_regs *) = 0; #endif @@ -50,8 +52,6 @@ extern unsigned long search_exception_table(unsigned long); void print_backtrace(unsigned long *sp) { - DECLARE_GLOBAL_DATA_PTR; - int cnt = 0; unsigned long i; |