[U-Boot] [PATCH 19/28] SPEAr : Changing the default environment variable bootargs

[Vipin KUMAR]

From: Vipin KUMAR <vipin.kumar at st.com>

Linux expects the console to be set to ttyAMA0,115200, so this change is to make
default bootargs to console=ttyAMA0,115200....

This patch modifies the default bootargs for all spear devices as following

For environment present in NOR flash
...root=/dev/mtdblock3...
For environment present in NAND flash
...root=/dev/mtdblock7...

Signed-off-by: Vipin Kumar <vipin.kumar at st.com>
---
 include/configs/spear-common.h  |   10 ++++++----
 include/configs/spear13xx_evb.h |   10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 1f7aff7..012a27c 100644
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -137,7 +137,7 @@
  */
 #define CONFIG_SYS_MONITOR_LEN			0x00040000
 #define CONFIG_ENV_SECT_SIZE			0x00010000
-#define CONFIG_FSMTDBLK				"/dev/mtdblock8 "
+#define CONFIG_FSMTDBLK				"/dev/mtdblock3 "
 
 #define CONFIG_BOOTCOMMAND			"bootm 0xf8050000"
 
@@ -163,7 +163,7 @@
 
 #define CONFIG_ENV_OFFSET			0x60000
 #define CONFIG_ENV_RANGE			0x10000
-#define CONFIG_FSMTDBLK				"/dev/mtdblock12 "
+#define CONFIG_FSMTDBLK				"/dev/mtdblock7 "
 
 #define CONFIG_BOOTCOMMAND			"nand read.jffs2 0x1600000 " \
 						"0x80000 0x4C0000; " \
@@ -171,8 +171,10 @@
 #endif
 
 #define CONFIG_BOOTARGS_NFS			"root=/dev/nfs ip=dhcp " \
-						"console=ttyS0 init=/bin/sh"
-#define CONFIG_BOOTARGS				"console=ttyS0 mem=128M "  \
+						"console=ttyAMA0,115200 " \
+						"init=/bin/sh"
+#define CONFIG_BOOTARGS				"console=ttyAMA0,115200 " \
+						"mem=128M "  \
 						"root="CONFIG_FSMTDBLK \
 						"rootfstype=jffs2"
 
diff --git a/include/configs/spear13xx_evb.h b/include/configs/spear13xx_evb.h
index bb0811c..eeb46c0 100644
--- a/include/configs/spear13xx_evb.h
+++ b/include/configs/spear13xx_evb.h
@@ -131,7 +131,7 @@
  */
 #define CONFIG_SYS_MONITOR_LEN			0x00040000
 #define CONFIG_ENV_SECT_SIZE			0x00010000
-#define CONFIG_FSMTDBLK				"/dev/mtdblock8 "
+#define CONFIG_FSMTDBLK				"/dev/mtdblock3 "
 
 #define CONFIG_BOOTCOMMAND			"bootm 0xe6050000"
 
@@ -145,7 +145,7 @@
 
 #define CONFIG_ENV_OFFSET			0x60000
 #define CONFIG_ENV_RANGE			0x10000
-#define CONFIG_FSMTDBLK				"/dev/mtdblock12 "
+#define CONFIG_FSMTDBLK				"/dev/mtdblock7 "
 
 #define CONFIG_BOOTCOMMAND			"nand read.jffs2 0x1600000 " \
 						"0x80000 0x4C0000; " \
@@ -153,8 +153,10 @@
 #endif
 
 #define CONFIG_BOOTARGS_NFS			"root=/dev/nfs ip=dhcp " \
-						"console=ttyAMA0 init=/bin/sh"
-#define CONFIG_BOOTARGS				"console=ttyAMA0 mem=128M "  \
+						"console=ttyAMA0,115200 " \
+						"init=/bin/sh"
+#define CONFIG_BOOTARGS				"console=ttyAMA0,115200 " \
+						"mem=128M "  \
 						"root="CONFIG_FSMTDBLK \
 						"rootfstype=jffs2"
 
-- 
1.6.0.2