diff options
author | Wolfgang Denk <wd@denx.de> | 2010-12-14 00:06:00 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-12-14 00:06:00 +0100 |
commit | 63440c4a80cef3dafdb931a7f914dc6b53eb27e4 (patch) | |
tree | 7836b9e2e3a770ba5365dc861dcafa303122e654 /arch/arm/cpu/armv7/omap3/emif4.c | |
parent | fdb9482b42c28d314317ea0118181b1f32a7c689 (diff) | |
parent | 3600945b5aebb2d029c97c48a38d8dc960ad6935 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/omap3/emif4.c')
-rw-r--r-- | arch/arm/cpu/armv7/omap3/emif4.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/omap3/emif4.c b/arch/arm/cpu/armv7/omap3/emif4.c index 2227576b7b..30856372b3 100644 --- a/arch/arm/cpu/armv7/omap3/emif4.c +++ b/arch/arm/cpu/armv7/omap3/emif4.c @@ -29,6 +29,7 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/emif4.h> +DECLARE_GLOBAL_DATA_PTR; extern omap3_sysinfo sysinfo; static emif4_t *emif4_base = (emif4_t *)OMAP34XX_SDRC_BASE; @@ -139,7 +140,6 @@ void do_emif4_init(void) */ int dram_init(void) { - DECLARE_GLOBAL_DATA_PTR; unsigned int size0 = 0, size1 = 0; size0 = get_sdr_cs_size(CS0); @@ -157,7 +157,6 @@ int dram_init(void) void dram_init_banksize (void) { - DECLARE_GLOBAL_DATA_PTR; unsigned int size0 = 0, size1 = 0; size0 = get_sdr_cs_size(CS0); |