[U-Boot] [PATCH 2/2] ARM: sheevaplug: fix ENV offset and MTDPARTS

[Gerald Kerma]

This patch redefine ENV offset and MTDPARTS

Signed-off-by: Gerald Kerma <drEagle at doukki.net>

 Changes in v1:
 - define ENV offset to 0xe0000
 - define MTDPARTS and BOOTARGS to stay backward compatibles

Signed-off-by: Gerald Kerma <drEagle at doukki.net>
---
 include/configs/sheevaplug.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index 247789c..72b8af1 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -75,8 +75,8 @@
  * it has to be rounded to sector size
  */
 #define CONFIG_ENV_SIZE			0x20000	/* 128k */
-#define CONFIG_ENV_ADDR			0x80000
-#define CONFIG_ENV_OFFSET		0x80000	/* env starts here */
+#define CONFIG_ENV_ADDR			0xe0000
+#define CONFIG_ENV_OFFSET		0xe0000	/* env starts here */
 
 /*
  * Default environment variables
@@ -86,15 +86,18 @@
 	"${x_bootcmd_usb}; bootm 0x6400000;"
 
 #define CONFIG_MTDPARTS		\
-	"mtdparts=orion_nand:512K(uboot),"				\
-	"512K(env),1M(script),6M(kernel),"				\
-	"12M(ramdisk),4M(spare),-(rootfs)"
+	"mtdparts=orion_nand:"					\
+	"0xe0000 at 0x0(uboot),"					\
+	"0x20000 at 0xe0000(uboot_env),"				\
+	"3m at 1m(kernel)"						\
+	"1m at 4m(script)"						\
+	"- at 5m(root)\0"
 
 #define CONFIG_EXTRA_ENV_SETTINGS	"x_bootargs=console"	\
 	"=ttyS0,115200 mtdparts="CONFIG_MTDPARTS	\
 	"x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0" \
 	"x_bootcmd_usb=usb start\0" \
-	"x_bootargs_root=root=/dev/mtdblock3 rw rootfstype=jffs2\0"
+	"x_bootargs_root=root=/dev/mtdblock4 rw rootfstype=jffs2\0"
 
 #define MTDIDS_DEFAULT	"nand0=orion_nand"
 
-- 
1.9.1