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 /board/logicpd | |
| parent | 71aab09b2c1edd1b6e00819abd1e31c04db04f36 (diff) | |
| download | talos-obmc-uboot-2956532625cf8414ad3efb37598ba34db08d67ec.tar.gz talos-obmc-uboot-2956532625cf8414ad3efb37598ba34db08d67ec.zip | |
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 'board/logicpd')
| -rw-r--r-- | board/logicpd/zoom1/zoom1.c | 4 | ||||
| -rw-r--r-- | board/logicpd/zoom2/zoom2.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c index e442d687b7..7ef13cc623 100644 --- a/board/logicpd/zoom1/zoom1.c +++ b/board/logicpd/zoom1/zoom1.c @@ -39,14 +39,14 @@ #include <asm/mach-types.h> #include "zoom1.h" +DECLARE_GLOBAL_DATA_PTR; + /* * Routine: board_init * Description: Early hardware init. */ int board_init(void) { - DECLARE_GLOBAL_DATA_PTR; - gpmc_init(); /* in SRAM or SDRAM, finish GPMC */ /* board id for Linux */ gd->bd->bi_arch_number = MACH_TYPE_OMAP_LDP; diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c index e9f6625ce0..76793e42e7 100644 --- a/board/logicpd/zoom2/zoom2.c +++ b/board/logicpd/zoom2/zoom2.c @@ -43,6 +43,8 @@ #include "zoom2.h" #include "zoom2_serial.h" +DECLARE_GLOBAL_DATA_PTR; + /* * This the the zoom2, board specific, gpmc configuration for the * quad uart on the debug board. The more general gpmc configurations @@ -120,7 +122,6 @@ void zoom2_identify(void) */ int board_init (void) { - DECLARE_GLOBAL_DATA_PTR; u32 *gpmc_config; gpmc_init (); /* in SRAM or SDRAM, finish GPMC */ |
