diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-17 20:25:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-17 20:25:05 +0200 |
| commit | cacc342d5aa311673efdc05770cb53246dd41c9f (patch) | |
| tree | 628ad99e5ea23c3f6ae6f728167056001bd16847 /arch/arm/cpu/armv7/omap4/board.c | |
| parent | 5641f34f8b83b3dcb64ba5f6c0f83d2204c41387 (diff) | |
| parent | 59e0d611ad0418245e9600b50bf1374a725c95b6 (diff) | |
| download | u-boot-imx-cacc342d5aa311673efdc05770cb53246dd41c9f.zip u-boot-imx-cacc342d5aa311673efdc05770cb53246dd41c9f.tar.gz u-boot-imx-cacc342d5aa311673efdc05770cb53246dd41c9f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/armv7/omap4/board.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap4/board.c | 5 |
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; } |