[U-Boot-Users] [PATCH 3/6] AT91CAP9ADK: Normalize BOOTARGS

[Stelian Pop]

Set bootargs to sane values so that Linux boots out of the box in the two
supported configurations:
- boot from dataflash: the bootstrap, U-Boot, its environment
and the Linux kernel are located in the dataflash, the JFFS2 root
filesystem occupies the whole NAND memory.
- boot from NOR: the bootstrap, U-Boot, its environment
and the Linux kernel are located in the NOR memory, the JFFS2 root
filesystem occupies the whole NAND memory.

Signed-off-by: Stelian Pop <stelian at popies.net>
---
 include/configs/at91cap9adk.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index a648ce0..78b2283 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -56,8 +56,6 @@
 #define CONFIG_USART3		1	/* USART 3 is DBGU */
 
 #define CONFIG_BOOTDELAY	3
-#define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
-				"root=/dev/mtdblock1 rw rootfstype=jffs2"
 
 /* #define CONFIG_ENV_OVERWRITE	1 */
 
@@ -145,6 +143,10 @@
 #define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE		0x4200
 #define CONFIG_BOOTCOMMAND	"cp.b 0xC003DE00 0x72000000 0x200040; bootm"
+#define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
+				"root=/dev/mtdblock1 " \
+				"mtdparts=physmap-flash.0:-(nor);at91_nand:-(root) "\
+				"rw rootfstype=jffs2"
 
 #else
 
@@ -155,6 +157,10 @@
 #define CFG_ENV_ADDR		(PHYS_FLASH_1 + CFG_ENV_OFFSET)
 #define CFG_ENV_SIZE		0x4000
 #define CONFIG_BOOTCOMMAND	"cp.b 0x10040000 0x72000000 0x200000; bootm"
+#define CONFIG_BOOTARGS		"console=ttyS0,115200 " \
+				"root=/dev/mtdblock4 " \
+				"mtdparts=physmap-flash.0:16k(bootstrap)ro,16k(env),224k(uboot)ro,-(linux);at91_nand:-(root) "\
+				"rw rootfstype=jffs2"
 
 #endif
 
-- 
1.5.3.3