summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Behme <dirk.behme@googlemail.com>2007-09-15 11:55:42 +0200
committerWolfgang Denk <wd@denx.de>2007-09-15 18:46:20 +0200
commit66b3f24d665be678a9dbb125b1e84185400f63b5 (patch)
treef3e7f7fb39f719eb722675731dab957e4d948959
parent6e7b7b6ea1b6d04dbe96242eb6a0c1c664c98e8c (diff)
downloadu-boot-imx-66b3f24d665be678a9dbb125b1e84185400f63b5.zip
u-boot-imx-66b3f24d665be678a9dbb125b1e84185400f63b5.tar.gz
u-boot-imx-66b3f24d665be678a9dbb125b1e84185400f63b5.tar.bz2
Make DECLARE_GLOBAL_DATA_PTR global for DaVinci
As discussed in [1], DECLARE_GLOBAL_DATA_PTR has to be global and not function local. Signed-off-by: Dirk Behme <dirk.behme@gmail.com> [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/31805
-rw-r--r--board/davinci/dv-evm/dv_board.c6
-rw-r--r--board/davinci/schmoogie/dv_board.c6
-rw-r--r--board/davinci/sonata/dv_board.c6
3 files changed, 6 insertions, 12 deletions
diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dv-evm/dv_board.c
index 604edb5..dce821b 100644
--- a/board/davinci/dv-evm/dv_board.c
+++ b/board/davinci/dv-evm/dv_board.c
@@ -31,6 +31,8 @@
#define MACH_TYPE_DAVINCI_EVM 901
+DECLARE_GLOBAL_DATA_PTR;
+
extern void i2c_init(int speed, int slaveaddr);
extern void timer_init(void);
extern int eth_hw_init(void);
@@ -115,8 +117,6 @@ void dsp_on(void)
int board_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
/* arch number of the board */
gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_EVM;
@@ -202,8 +202,6 @@ int misc_init_r (void)
int dram_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
diff --git a/board/davinci/schmoogie/dv_board.c b/board/davinci/schmoogie/dv_board.c
index 9f271a1..0a07523 100644
--- a/board/davinci/schmoogie/dv_board.c
+++ b/board/davinci/schmoogie/dv_board.c
@@ -31,6 +31,8 @@
#define MACH_TYPE_SCHMOOGIE 1255
+DECLARE_GLOBAL_DATA_PTR;
+
extern void i2c_init(int speed, int slaveaddr);
extern void timer_init(void);
extern int eth_hw_init(void);
@@ -115,8 +117,6 @@ void dsp_on(void)
int board_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
/* arch number of the board */
gd->bd->bi_arch_number = MACH_TYPE_SCHMOOGIE;
@@ -244,8 +244,6 @@ int misc_init_r (void)
int dram_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
diff --git a/board/davinci/sonata/dv_board.c b/board/davinci/sonata/dv_board.c
index 99857c4..cd2dac6 100644
--- a/board/davinci/sonata/dv_board.c
+++ b/board/davinci/sonata/dv_board.c
@@ -31,6 +31,8 @@
#define MACH_TYPE_SONATA 1254
+DECLARE_GLOBAL_DATA_PTR;
+
extern void i2c_init(int speed, int slaveaddr);
extern void timer_init(void);
extern int eth_hw_init(void);
@@ -115,8 +117,6 @@ void dsp_on(void)
int board_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
/* arch number of the board */
gd->bd->bi_arch_number = MACH_TYPE_SONATA;
@@ -199,8 +199,6 @@ int misc_init_r (void)
int dram_init(void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;