summaryrefslogtreecommitdiff
path: root/board/davinci/sonata/dv_board.c
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2007-10-14 14:31:47 +0200
committerMichal Simek <monstr@monstr.eu>2007-10-14 14:31:47 +0200
commit95df6f4ebaaa3972e312be1acf7650a18b84bf3d (patch)
treeee69b8872cf8c295a48244280c82d98e191111ab /board/davinci/sonata/dv_board.c
parentb49c90df6e7cfcfb8b862b8bbf8448dff5eed9a5 (diff)
parentb90c045f035c3cc9b5d2edaed6048dfb74e40763 (diff)
downloadu-boot-imx-95df6f4ebaaa3972e312be1acf7650a18b84bf3d.zip
u-boot-imx-95df6f4ebaaa3972e312be1acf7650a18b84bf3d.tar.gz
u-boot-imx-95df6f4ebaaa3972e312be1acf7650a18b84bf3d.tar.bz2
Merge ../master/
Diffstat (limited to 'board/davinci/sonata/dv_board.c')
-rw-r--r--board/davinci/sonata/dv_board.c6
1 files changed, 2 insertions, 4 deletions
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;