fix compile errors when CONFIG_ENV_IS_IN_NAND is undefined

diff --git a/include/configs/tx6q.h b/include/configs/tx6q.h
index cf78da147b4e0f47c3a460b9ffdbf45fb4293550..e63437384cefc02f048bf1810bb5e7d9454faaae 100644 (file)
--- a/include/configs/tx6q.h
+++ b/include/configs/tx6q.h
@@ -222,6 +222,13 @@
 #define CONFIG_MX6_INTER_LDO_BYPASS    0
 #endif
 
+/* define one of the following options:
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_ENV_IS_NOWHERE
+*/
+#define CONFIG_ENV_IS_IN_NAND
+
 /*
  * NAND flash driver
  */
@@ -231,7 +238,6 @@
 #define CONFIG_MTD_DEBUG
 #define CONFIG_MTD_DEBUG_VERBOSE       4
 #endif
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_NAND_MXS
 #define CONFIG_NAND_PAGE_SIZE          2048
 #define CONFIG_NAND_OOB_SIZE           64
@@ -248,23 +254,34 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_USE_FLASH_BBT
+#define CONFIG_SYS_NAND_BASE           0x00000000
+#define CONFIG_CMD_ROMUPDATE
+#else
+#undef CONFIG_ENV_IS_IN_NAND
+#endif /* CONFIG_CMD_NAND */
+
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_OFFSET              (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
 #define CONFIG_ENV_SIZE                        SZ_128K
 #define CONFIG_ENV_RANGE               0x60000
-#endif
-#define CONFIG_SYS_NAND_BASE           0x00000000
-#define CONFIG_CMD_ROMUPDATE
-#endif /* CONFIG_CMD_NAND */
+#ifdef CONFIG_ENV_OFFSET_REDUND
+#define CONFIG_SYS_ENV_PART_STR                xstr(CONFIG_ENV_RANGE)          \
+       "(env),"                                                        \
+       xstr(CONFIG_ENV_RANGE)                                          \
+       "(env2),"
+#else
+#define CONFIG_SYS_ENV_PART_STR                xstr(CONFIG_ENV_RANGE)          \
+       "(env),"
+#endif /* CONFIG_ENV_OFFSET_REDUND */
+#else
+#define CONFIG_SYS_ENV_PART_STR                /* no env partition in NAND */
+#endif /* CONFIG_ENV_IS_IN_NAND */
 
 /*
  * MMC Driver
  */
 #ifdef CONFIG_CMD_MMC
-#ifndef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_IS_IN_MMC
-#endif
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
 #define CONFIG_FSL_ESDHC
@@ -280,28 +297,25 @@
  * Environments on MMC
  */
 #ifdef CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV 0
+#define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_ENV_OVERWRITE
 /* Associated with the MMC layout defined in mmcops.c */
 #define CONFIG_ENV_OFFSET              SZ_1K
 #define CONFIG_ENV_SIZE                        (SZ_128K - CONFIG_ENV_OFFSET)
 #define CONFIG_DYNAMIC_MMC_DEVNO
 #endif /* CONFIG_ENV_IS_IN_MMC */
+#else
+#undef CONFIG_ENV_IS_IN_MMC
 #endif /* CONFIG_CMD_MMC */
 
-#ifdef CONFIG_ENV_OFFSET_REDUND
-#define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
-       "1m@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) "(u-boot),"             \
-       xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),"                                                        \
-       xstr(CONFIG_ENV_RANGE)                                          \
-       "(env2),4m(linux),16m(rootfs),256k(dtb),-(userfs)"
-#else
+#ifdef CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE                        SZ_4K
+#endif
+
 #define MTDPARTS_DEFAULT               "mtdparts=" MTD_NAME ":"        \
        "1m@" xstr(CONFIG_SYS_NAND_U_BOOT_OFFS) "(u-boot),"             \
-       xstr(CONFIG_ENV_RANGE)                                          \
-       "(env),4m(linux),16m(rootfs),256k(dtb),-(userfs)"
-#endif
+       CONFIG_SYS_ENV_PART_STR                                         \
+       "4m(linux),16m(rootfs),256k(dtb),-(userfs)"
 
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - /* Fix this */ \