ARM: at91: at91sam9rlek: update the default nand flash configs
PATCH 1/1 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 <[email protected]>
---
include/configs/at91sam9rlek.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
include/configs/at91sam9rlek.h +9 -7
@@ -151,14 +151,16 @@/* 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 0x300000; bootz 0x22000000" +#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
Signature · 1 line
1.9.1
PATCH 1/1 ARM: at91: at91sam9rlek: update the default nand flash configs
Hi Josh
Quoted 4 lines · Josh Wu
Update the nand flash offset mapping, default nand bootcmand and bootargs to align with linux4sam.org.
Signed-off-by Josh Wu <[email protected]>
except the following concern:
Acked-by Bo Shen <[email protected]>
Quoted 14 lines
---
include/configs/at91sam9rlek.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)include/configs/at91sam9rlek.h +0
-1@@ -151,14 +151,16 @@/* bootstrap + u-boot + env + linux in nandflash */ #define CONFIG_ENV_IS_IN_NAND 1 -#define CONFIG_ENV_OFFSET 0x60000
include/configs/at91sam9rlek.h line 157
Quoted 10 lines
include/configs/at91sam9rlek.h +3
-6-#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 0x300000; bootz 0x22000000"
The kernel partition is 6MiB, as here only read 3MiB. As the Linux kernel is switch to multi-platform support. The Linux kernel size is bigger than 3MiB now.
include/configs/at91sam9rlek.h line 166
Quoted 10 lines
include/configs/at91sam9rlek.h +6
-0+#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
Best Regards,
Bo Shen