summaryrefslogtreecommitdiffstats
path: root/board/csb226/csb226.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-04-20 12:25:10 -0500
committerKumar Gala <galak@kernel.crashing.org>2006-04-20 12:25:10 -0500
commitb86d7622b33892b1dafe761a7a9eaeeab9f3816b (patch)
tree56b1b6fc978166abce4afa8e9dee0af94bfc3cd6 /board/csb226/csb226.c
parentf8edca2e9a128f526b1fe6f997f7adb852cf5b3c (diff)
parent56a4a63c106cc317fc0fe42686a99416fc469f5b (diff)
downloadu-boot-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.gz
u-boot-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.xz
u-boot-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.zip
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
Diffstat (limited to 'board/csb226/csb226.c')
-rw-r--r--board/csb226/csb226.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/board/csb226/csb226.c b/board/csb226/csb226.c
index c99a71557c..80caf8b464 100644
--- a/board/csb226/csb226.c
+++ b/board/csb226/csb226.c
@@ -26,6 +26,8 @@
#include <common.h>
#include <asm/arch/pxa-regs.h>
+DECLARE_GLOBAL_DATA_PTR;
+
#ifdef CONFIG_SHOW_BOOT_PROGRESS
# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
#else
@@ -65,8 +67,6 @@ int misc_init_r(void)
int board_init (void)
{
- DECLARE_GLOBAL_DATA_PTR;
-
/* memory and cpu-speed are setup before relocation */
/* so we do _nothing_ here */
@@ -88,8 +88,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;