diff options
| author | Stefan Roese <sr@denx.de> | 2014-07-09 17:18:09 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-25 16:26:09 -0400 |
| commit | fb2fcb798a524858780b7a8c7ea8a21d104c36b1 (patch) | |
| tree | 681e0036ff6ea5c3b4e7ff7c2d36ed9c7e2c1376 | |
| parent | e6f9d419c86d311b19c27ae12d2d7dd921c06058 (diff) | |
| download | blackbird-obmc-uboot-fb2fcb798a524858780b7a8c7ea8a21d104c36b1.tar.gz blackbird-obmc-uboot-fb2fcb798a524858780b7a8c7ea8a21d104c36b1.zip | |
ARM: omap: Fix GPMC init for OMAP3 platforms
Commit a0a37183 (ARM: omap: merge GPMC initialization code for all
platform) broke NAND on OMAP3 based platforms. I noticed this while
testing the latest 2014.07-rc version on the TAO3530 board. NAND
detection did not work with this error message:
NAND: nand: error: Unable to find NAND settings in GPMC Configuration - quitting
As OMAP3 configs don't set CONFIG_NAND but CONFIG_NAND_CMD. the GPMC
was not initialized for NAND at all. This patch now fixes this issue.
Tested on TAO3530 board.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Pekon Gupta <pekon@ti.com>
Cc: Tom Rini <trini@ti.com>
Acked-by: Pekon Gupta <pekon@ti.com>
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/mem-common.c | 2 |
1 files changed, 1 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 5bc7e1f19b..ba26cd1fdb 100644 --- a/arch/arm/cpu/armv7/omap-common/mem-common.c +++ b/arch/arm/cpu/armv7/omap-common/mem-common.c @@ -89,7 +89,7 @@ void gpmc_init(void) }; u32 size = GPMC_SIZE_16M; u32 base = CONFIG_SYS_FLASH_BASE; -#elif defined(CONFIG_NAND) +#elif defined(CONFIG_NAND) || defined(CONFIG_CMD_NAND) /* configure GPMC for NAND */ const u32 gpmc_regs[GPMC_MAX_REG] = { M_NAND_GPMC_CONFIG1, M_NAND_GPMC_CONFIG2, |
