Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 0a3118d82aaed499fea73d2d247fa8c2d706162a..71be8238998b7a077bfa32d42e4f6922d8c230ef 100644 (file)
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -30,6 +30,11 @@
 #define CONFIG_LZMA
 #define CONFIG_LZO
 
+/*
+ * Miscellaneous configurable options
+ */
+#define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser */
+
 /*
  * Commands configuration
  */
@@ -74,8 +79,10 @@
        "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \
        "${x_bootcmd_usb}; bootm 0x6400000;"
 
-#define CONFIG_MTDPARTS                "orion_nand:512k(uboot),"       \
-       "3m@1m(kernel),1m@4m(psm),13m@5m(rootfs) rw\0"
+#define CONFIG_MTDPARTS                \
+       "mtdparts=orion_nand:512K(uboot),"                              \
+       "512K(env),1M(script),6M(kernel),"                              \
+       "12M(ramdisk),4M(spare),-(rootfs)"
 
 #define CONFIG_EXTRA_ENV_SETTINGS      "x_bootargs=console"    \
        "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS        \