mx28evk: Guard NAND-related ENV defines with CONFIG_ENV_IS_IN_NAND
authorTom Rini <trini@ti.com>
Tue, 30 Apr 2013 20:00:15 +0000 (16:00 -0400)
committerTom Rini <trini@ti.com>
Wed, 1 May 2013 20:41:10 +0000 (16:41 -0400)
The redundancy related defines are only correct for NAND, so guard all
of that area with CONFIG_ENV_IS_IN_NAND

Cc: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Tom Rini <trini@ti.com>
include/configs/mx28evk.h

index d470b47..3747955 100644 (file)
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 
 /* Environment is in NAND */
+#ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE           (128 * 1024)
 #define CONFIG_ENV_RANGE               (512 * 1024)
-#ifndef CONFIG_ENV_OFFSET
 #define CONFIG_ENV_OFFSET              0x300000
-#endif
 #define CONFIG_ENV_OFFSET_REDUND       \
                (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
+#endif
 
 #define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS