ARM: at91: at91sam9rlek: update the default nand flash configs

Update the nand flash offset mapping, default nand bootcmand and
bootargs to align with linux4sam.org.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Bo Shen <voice.shen@atmel.com>

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index d5f0197466176a7958c29b66cc361fcefadc4b5b..f435d71d254111d4c21f6353b2c1e70918d38a48 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -151,14 +151,18 @@
 
 /* bootstrap + u-boot + env + linux in nandflash */
 #define CONFIG_ENV_IS_IN_NAND          1
-#define CONFIG_ENV_OFFSET              0x60000
-#define CONFIG_ENV_OFFSET_REDUND       0x80000
+#define CONFIG_ENV_OFFSET              0xc0000
+#define CONFIG_ENV_OFFSET_REDUND       0x100000
 #define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */
-#define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
-#define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
-                               "root=/dev/mtdblock5 " \
-                               "mtdparts=atmel_nand:128k(bootstrap)ro,256k(uboot)ro,128k(env1)ro,128k(env2)ro,2M(linux),-(root) " \
-                               "rw rootfstype=jffs2"
+#define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0x200000 0x600000; "      \
+                               "nand read 0x21000000 0x180000 0x80000; "       \
+                               "bootz 0x22000000 - 0x21000000"
+#define CONFIG_BOOTARGS                \
+                               "console=ttyS0,115200 earlyprintk "                             \
+                               "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"          \
+                               "256K(env),256k(evn_redundent),256k(spare),"                    \
+                               "512k(dtb),6M(kernel)ro,-(rootfs) "                             \
+                               "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
 
 #endif