summaryrefslogtreecommitdiff
path: root/board/sbc2410x
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/sbc2410x
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/sbc2410x')
-rw-r--r--board/sbc2410x/sbc2410x.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/board/sbc2410x/sbc2410x.c b/board/sbc2410x/sbc2410x.c
index b4865e1..6c894a3 100644
--- a/board/sbc2410x/sbc2410x.c
+++ b/board/sbc2410x/sbc2410x.c
@@ -35,7 +35,7 @@
#include <linux/mtd/nand.h>
#endif
-/* ------------------------------------------------------------------------- */
+DECLARE_GLOBAL_DATA_PTR;
#define FCLK_SPEED 1
@@ -74,7 +74,6 @@ static inline void delay (unsigned long loops)
int board_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
S3C24X0_GPIO * const gpio = S3C24X0_GetBase_GPIO();
@@ -128,8 +127,6 @@ int board_init (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;