Merge with git://git.kernel.org/pub/scm/boot/u-boot/u-boot.git#mpc83xx

[u-boot] / include / configs / delta.h

diff --git a/include/configs/delta.h b/include/configs/delta.h
index 8e5e6128f045ccc1daff0ed922b372fceb933567..b42a7e2c1aec9dd7ffae5a430db455a7bd149712 100644 (file)
--- a/include/configs/delta.h
+++ b/include/configs/delta.h
@@ -73,9 +73,8 @@
 #ifdef TURN_ON_ETHERNET
 # define CONFIG_COMMANDS        (CONFIG_CMD_DFL | CFG_CMD_PING)
 #else
-# define CONFIG_COMMANDS       ((CONFIG_CMD_DFL | CFG_CMD_NAND) \
-                               & ~(CFG_CMD_NET | CFG_CMD_FLASH | \
-                                   CFG_CMD_ENV | CFG_CMD_IMLS))
+# define CONFIG_COMMANDS       ((CONFIG_CMD_DFL | CFG_CMD_ENV | CFG_CMD_NAND) \
+                               & ~(CFG_CMD_NET | CFG_CMD_FLASH | CFG_CMD_IMLS))
 #endif
 
 
@@ -280,8 +279,8 @@
 #define        CFG_MONITOR_LEN         PHYS_FLASH_SECT_SIZE
 #endif /* #ifndef CFG_NO_FLASH */
 
-#define CFG_ENV_IS_NOWHERE
-/* #define CFG_ENV_IS_IN_NAND      1 */
+/* #define CFG_ENV_IS_NOWHERE */
+#define CFG_ENV_IS_IN_NAND     1
 #define CFG_ENV_OFFSET         0x40000
 #define CFG_ENV_SIZE           0x4000