Merge with /home/wd/git/u-boot/master

[oweals/u-boot.git] / include / configs / trab.h

diff --git a/include/configs/trab.h b/include/configs/trab.h
index b6d4bcf1788dacc8897db29415cc5d51d61febd5..935aca2daab9de5187b7fc10287f35e57d256669 100644 (file)
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -165,7 +165,6 @@
                                CFG_CMD_DATE                    | \
                                CFG_CMD_DHCP                    | \
                                CFG_CMD_FAT                     | \
-                               CFG_CMD_JFFS2                   | \
                                CFG_CMD_NFS                     | \
                                CFG_CMD_SNTP                    | \
                                CFG_CMD_USB     )
@@ -179,7 +178,6 @@
                                CFG_CMD_DATE                    | \
                                CFG_CMD_DHCP                    | \
                                CFG_CMD_FAT                     | \
-                               CFG_CMD_JFFS2                   | \
                                CFG_CMD_NFS                     | \
                                CFG_CMD_SNTP                    | \
                                CFG_CMD_USB     )
@@ -389,10 +387,10 @@
 #define MTDIDS_DEFAULT         "nor0=0"
 
 /* production flash layout */
-#define MTDPARTS_DEFAULT       "mtdparts=0:32k(Firmware1)ro,"          \
+#define MTDPARTS_DEFAULT       "mtdparts=0:16k(Firmware1)ro,"          \
                                                "16k(Env1),"            \
                                                "16k(Env2),"            \
-                                               "320k(Firmware2)ro,"    \
+                                               "336k(Firmware2)ro,"    \
                                                "896k(Kernel),"         \
                                                "5376k(Root-FS),"       \
                                                "1408k(JFFS2),"         \