Merge branch 'wd'

[karo-tx-uboot.git] / include / configs / trab.h

diff --git a/include/configs/trab.h b/include/configs/trab.h
index 63caac0c05144453a62325f4486557feb0eb68e4..a2dc8e7bff8936ccb4137679c03f22d7464b070d 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -160,7 +160,6 @@
                                CFG_CMD_DATE                    | \
                                CFG_CMD_DHCP                    | \
                                CFG_CMD_FAT                     | \
-                               CFG_CMD_JFFS2                   | \
                                CFG_CMD_NFS                     | \
                                CFG_CMD_SNTP                    | \
                                CFG_CMD_USB     )
@@ -174,7 +173,6 @@
                                CFG_CMD_DATE                    | \
                                CFG_CMD_DHCP                    | \
                                CFG_CMD_FAT                     | \
-                               CFG_CMD_JFFS2                   | \
                                CFG_CMD_NFS                     | \
                                CFG_CMD_SNTP                    | \
                                CFG_CMD_USB     )
@@ -404,7 +402,7 @@
 #endif
 
 /* timeout values are in ticks */
-#define CFG_FLASH_ERASE_TOUT   (2*CFG_HZ) /* Timeout for Flash Erase */
+#define CFG_FLASH_ERASE_TOUT   (15*CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2*CFG_HZ) /* Timeout for Flash Write */
 
 #define        CFG_ENV_IS_IN_FLASH     1