summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap4
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2013-04-04 19:51:14 +0000
committerTom Rini <trini@ti.com>2013-04-08 11:29:34 -0400
commitd3d82e9fc69e284fa66ca82c8623f7de64a28130 (patch)
treedf7cf4906d83f428df10f7737bda9c6778e1aa61 /arch/arm/cpu/armv7/omap4
parenta8f408a8c4607a63cf2803be205f7350f316f3bc (diff)
downloadblackbird-obmc-uboot-d3d82e9fc69e284fa66ca82c8623f7de64a28130.tar.gz
blackbird-obmc-uboot-d3d82e9fc69e284fa66ca82c8623f7de64a28130.zip
arm: omap4: Fix SDRAM AUTO DETECTION
Commit "8602114 omap: emif: configure emif only when required" breaks SDRAM_AUTO_DETECTION. The issue is dmm_init() depends on emif_sizes[](SDRAM Auto detection) done in do_sdram_init(). The above commit moves dmm_init() above do_sdram_init() because of which dmm_init() uses uninitialized emif_sizes[]. So instead of using global emif_sizes[], get sdram details locally and calculate emif sizes. Reported-by: Michael Cashwell <mboards@prograde.net> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap4')
-rw-r--r--arch/arm/cpu/armv7/omap4/emif.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap4/emif.c b/arch/arm/cpu/armv7/omap4/emif.c
index ca4823dd79..53f60635b1 100644
--- a/arch/arm/cpu/armv7/omap4/emif.c
+++ b/arch/arm/cpu/armv7/omap4/emif.c
@@ -33,7 +33,6 @@
#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
u32 *const T_num = (u32 *)OMAP4_SRAM_SCRATCH_EMIF_T_NUM;
u32 *const T_den = (u32 *)OMAP4_SRAM_SCRATCH_EMIF_T_DEN;
-u32 *const emif_sizes = (u32 *)OMAP4_SRAM_SCRATCH_EMIF_SIZE;
#endif
#ifdef CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
OpenPOWER on IntegriCloud