diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 12:25:10 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 12:25:10 -0500 |
| commit | b86d7622b33892b1dafe761a7a9eaeeab9f3816b (patch) | |
| tree | 56b1b6fc978166abce4afa8e9dee0af94bfc3cd6 /board/integratorap/integratorap.c | |
| parent | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (diff) | |
| parent | 56a4a63c106cc317fc0fe42686a99416fc469f5b (diff) | |
| download | u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.zip u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.gz u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.bz2 | |
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
Diffstat (limited to 'board/integratorap/integratorap.c')
| -rw-r--r-- | board/integratorap/integratorap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/board/integratorap/integratorap.c b/board/integratorap/integratorap.c index d4f61d6..e659907 100644 --- a/board/integratorap/integratorap.c +++ b/board/integratorap/integratorap.c @@ -39,6 +39,8 @@ #include <pci.h> #endif +DECLARE_GLOBAL_DATA_PTR; + void flash__init (void); void ether__init (void); void peripheral_power_enable (void); @@ -65,8 +67,6 @@ static inline void delay (unsigned long loops) int board_init (void) { - DECLARE_GLOBAL_DATA_PTR; - /* arch number of Integrator Board */ gd->bd->bi_arch_number = MACH_TYPE_INTEGRATOR; @@ -480,8 +480,6 @@ void ether__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; |