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 2a0a8fd5eea5fce0a2dcadcdcf7b6033b558addd..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
 
 
@@ -157,7 +156,7 @@
 #define CFG_DRAM_BASE          0xa0000000 /* at CS0 */
 #define CFG_DRAM_SIZE          0x04000000 /* 64 MB Ram */
 
-#define CFG_SKIP_DRAM_SCRUB    1
+#undef CFG_SKIP_DRAM_SCRUB
 
 /*
  * NAND Flash
@@ -172,7 +171,7 @@
 #define SECTORSIZE             512
 #define NAND_DELAY_US          25      /* mk@tbd: could be 0, I guess */
 
-/* nand timeout values */      
+/* nand timeout values */
 #define CFG_NAND_PROG_ERASE_TO 3000
 #define CFG_NAND_OTHER_TO      100
 #define CFG_NAND_SENDCMD_RETRY 3
@@ -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