diff options
| author | John Rigby <john.rigby@linaro.org> | 2010-12-20 18:27:51 -0700 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-12-21 11:33:36 +0100 |
| commit | 2956532625cf8414ad3efb37598ba34db08d67ec (patch) | |
| tree | 19d9df98e764da9970e9cd0d70243fbaa9120fd5 /arch/m68k | |
| parent | 71aab09b2c1edd1b6e00819abd1e31c04db04f36 (diff) | |
| download | u-boot-imx-2956532625cf8414ad3efb37598ba34db08d67ec.zip u-boot-imx-2956532625cf8414ad3efb37598ba34db08d67ec.tar.gz u-boot-imx-2956532625cf8414ad3efb37598ba34db08d67ec.tar.bz2 | |
Move DECLARE_GLOBAL_DATA_PTR to file scope
It can be optimised out by the compiler otherwise resulting
in obscure errors like a board not booting.
This has been documented in README since 2006 when these were
first fixed up for GCC 4.x.
Signed-off-by: John Rigby <john.rigby@linaro.org>
Fix some additional places.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-By: Albert ARIBAUD <albert.aribaud@free.fr>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/cpu/mcf52x2/cpu.c | 3 | ||||
| -rw-r--r-- | arch/m68k/cpu/mcf547x_8x/speed.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c index 9fb717c..fb60462 100644 --- a/arch/m68k/cpu/mcf52x2/cpu.c +++ b/arch/m68k/cpu/mcf52x2/cpu.c @@ -74,8 +74,7 @@ int watchdog_disable(void) { volatile wdog_t *wdt = (volatile wdog_t *)(MMAP_WDOG); - wdt->sr = 0x5555; /* reset watchdog counteDECLARE_GLOBAL_DATA_PTR; -r */ + wdt->sr = 0x5555; /* reset watchdog counter */ wdt->sr = 0xAAAA; wdt->cr = 0; /* disable watchdog timer */ diff --git a/arch/m68k/cpu/mcf547x_8x/speed.c b/arch/m68k/cpu/mcf547x_8x/speed.c index 2cee488..31130b5 100644 --- a/arch/m68k/cpu/mcf547x_8x/speed.c +++ b/arch/m68k/cpu/mcf547x_8x/speed.c @@ -30,13 +30,13 @@ #include <asm/immap.h> +DECLARE_GLOBAL_DATA_PTR; + /* * get_clocks() fills in gd->cpu_clock and gd->bus_clk */ int get_clocks(void) { - DECLARE_GLOBAL_DATA_PTR; - gd->bus_clk = CONFIG_SYS_CLK; gd->cpu_clk = (gd->bus_clk * 2); |