summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2010-09-29 20:59:51 -0700
committerWolfgang Denk <wd@denx.de>2010-10-17 20:14:30 +0200
commit57b512b2ecc9c7a6c8a39c5356ea80fc3164d9e4 (patch)
tree1801de996386dc76866815768007e7c1e9c9d3f7 /arch/arm/cpu
parent136c69ad7917f23d401c3a794cd0f5a4ab2230de (diff)
downloadu-boot-imx-57b512b2ecc9c7a6c8a39c5356ea80fc3164d9e4.zip
u-boot-imx-57b512b2ecc9c7a6c8a39c5356ea80fc3164d9e4.tar.gz
u-boot-imx-57b512b2ecc9c7a6c8a39c5356ea80fc3164d9e4.tar.bz2
ARMV7: OMAP4: Implement relocation for Panda and OMAP4430SDP
This patch fixes the build breakage introduced by the recent relocation changes for ARMV7 Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/omap4/board.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c
index 8c1f395..24a66f5 100644
--- a/arch/arm/cpu/armv7/omap4/board.c
+++ b/arch/arm/cpu/armv7/omap4/board.c
@@ -102,8 +102,13 @@ int dram_init(void)
{
DECLARE_GLOBAL_DATA_PTR;
+#if defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
gd->bd->bi_dram[0].start = 0x80000000;
gd->bd->bi_dram[0].size = sdram_size();
+#else
+ gd->ram_size = sdram_size();
+#endif
+
return 0;
}