|
@@ -239,15 +239,20 @@
|
|
|
|
|
|
#define CONFIG_NAND_OMAP_GPMC
|
|
|
#define GPMC_NAND_ECC_LP_x16_LAYOUT
|
|
|
-#define CONFIG_ENV_IS_IN_NAND
|
|
|
#define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET
|
|
|
#elif defined(CONFIG_CMD_ONENAND)
|
|
|
#define CONFIG_SYS_FLASH_BASE PISMO1_ONEN_BASE
|
|
|
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
|
|
|
+#endif
|
|
|
|
|
|
+#if !defined(CONFIG_ENV_IS_NOWHERE)
|
|
|
+#if defined(CONFIG_CMD_NAND)
|
|
|
+#define CONFIG_ENV_IS_IN_NAND
|
|
|
+#elif defined(CONFIG_CMD_ONENAND)
|
|
|
#define CONFIG_ENV_IS_IN_ONENAND
|
|
|
#define CONFIG_ENV_OFFSET ONENAND_ENV_OFFSET
|
|
|
#endif
|
|
|
+#endif /* CONFIG_ENV_IS_NOWHERE */
|
|
|
|
|
|
#define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET
|
|
|
|