Merge git://git.denx.de/u-boot-marvell

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index ebc3d642f133cbe6900415a22a99d87f9711cac6..c529636a66def1c894330942a8fc657bc8d8f033 100644 (file)
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -60,12 +60,12 @@
  */
 #define CONFIG_BOOTCOMMAND             "${x_bootcmd_kernel}; " \
        "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \
-       "${x_bootcmd_usb}; bootm 0x6400000;"
+       "bootm 0x6400000;"
 
 #define CONFIG_MTDPARTS                \
-       "mtdparts=orion_nand:512K(uboot),"                              \
+       "orion_nand:512K(uboot),"                               \
        "512K(env),1M(script),6M(kernel),"                              \
-       "12M(ramdisk),4M(spare),-(rootfs)"
+       "12M(ramdisk),4M(spare),-(rootfs)\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS      "x_bootargs=console"    \
        "=ttyS0,115200 mtdparts="CONFIG_MTDPARTS        \