diff options
author | Wolfgang Denk <wd@denx.de> | 2010-11-26 21:33:14 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-11-26 21:33:14 +0100 |
commit | 41bb7531e1382e730b8a6b06d249ea72d936c468 (patch) | |
tree | 2a4fe1e8c16802e76aff9fd790e23e34c18c7d37 /arch/arm/cpu/armv7 | |
parent | c70e7ddb7e15e768d79edcbc4322d735e65ec31f (diff) | |
parent | e42a7dff09dd7306f8eaffbe8aaf44148dbfba35 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7')
-rw-r--r-- | arch/arm/cpu/armv7/omap4/board.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c index e7651d2dd5..fcd29a73e0 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap4/board.c @@ -32,6 +32,8 @@ #include <asm/arch/sys_proto.h> #include <asm/sizes.h> +DECLARE_GLOBAL_DATA_PTR; + /* * Routine: s_init * Description: Does early system init of muxing and clocks. @@ -100,7 +102,6 @@ u32 sdram_size(void) */ int dram_init(void) { - DECLARE_GLOBAL_DATA_PTR; gd->ram_size = sdram_size(); |