summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAsh Charles <ashcharles@gmail.com>2014-06-06 11:27:28 -0700
committerTom Rini <trini@ti.com>2014-06-19 17:53:41 -0400
commit2868a5dff373f6d173ba2d060bbe910c38254cbf (patch)
tree34cac333b8e3c7446b54a9bdc66ebbe514a5ea1f /arch
parent0a26e1d6c394aacbf1153977b7348d1dff85db3f (diff)
downloadu-boot-imx-2868a5dff373f6d173ba2d060bbe910c38254cbf.zip
u-boot-imx-2868a5dff373f6d173ba2d060bbe910c38254cbf.tar.gz
u-boot-imx-2868a5dff373f6d173ba2d060bbe910c38254cbf.tar.bz2
omap: Don't enable GPMC CS0 with nothing attached
If CONFIG_(NAND|NOR|ONENAND) is not defined, no configuration is set for GPMC on chip select #0---size is 0. In this case, the GPMC configuration should be reset but not enabled. Enabling causes the Gumstix DuoVero board to hang when entering Linux. Signed-off-by: Ash Charles <ashcharles@gmail.com> [trini: Switch to testing base as GPMC_SIZE_256M is 0x0] Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/omap-common/mem-common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/mem-common.c b/arch/arm/cpu/armv7/omap-common/mem-common.c
index 944ef84..11be480 100644
--- a/arch/arm/cpu/armv7/omap-common/mem-common.c
+++ b/arch/arm/cpu/armv7/omap-common/mem-common.c
@@ -133,5 +133,6 @@ void gpmc_init(void)
writel(0, &gpmc_cfg->cs[0].config7);
sdelay(1000);
/* enable chip-select specific configurations */
- enable_gpmc_cs_config(gpmc_regs, &gpmc_cfg->cs[0], base, size);
+ if (base != 0)
+ enable_gpmc_cs_config(gpmc_regs, &gpmc_cfg->cs[0], base, size);
}