summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony LIU <junjie.liu@freescale.com>2012-10-25 16:37:53 +0800
committerTony LIU <junjie.liu@freescale.com>2012-10-25 17:15:36 +0800
commit09420eacbc8a5b9c87da1377a7d24125d3950703 (patch)
tree1a25b87fd938ab56a476b00516b32ebd1ee48d28
parente4ab626ad1067aa9c3491d8888c8d402bcdca547 (diff)
ENGR00231155 add enable_wait_mode=off for all the mx6q/dl mfg uboot
- currently only a work around can be applied, the root cause is not identified yet The workaround is to disable wait mode, so all the mfgtool uboot need to add "enable_wait_mode=off" in the cmd line pass to kernel Signed-off-by: Tony LIU <junjie.liu@freescale.com>
-rw-r--r--include/configs/mx6dl_arm2_mfg.h3
-rw-r--r--include/configs/mx6dl_sabresd_mfg.h3
-rw-r--r--include/configs/mx6q_arm2_mfg.h3
-rw-r--r--include/configs/mx6q_sabreauto_mfg.h3
-rw-r--r--include/configs/mx6q_sabreauto_spi-nor_mfg.h3
-rw-r--r--include/configs/mx6q_sabreauto_weimnor_mfg.h2
-rw-r--r--include/configs/mx6q_sabrelite_mfg.h3
-rw-r--r--include/configs/mx6q_sabresd_mfg.h3
-rw-r--r--include/configs/mx6solo_sabreauto_mfg.h2
-rw-r--r--include/configs/mx6solo_sabreauto_spi-nor_mfg.h3
-rw-r--r--include/configs/mx6solo_sabreauto_weimnor_mfg.h3
11 files changed, 20 insertions, 11 deletions
diff --git a/include/configs/mx6dl_arm2_mfg.h b/include/configs/mx6dl_arm2_mfg.h
index aa6d0dc5e4..f645b5326f 100644
--- a/include/configs/mx6dl_arm2_mfg.h
+++ b/include/configs/mx6dl_arm2_mfg.h
@@ -114,7 +114,8 @@
#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
-#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc"
+#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\
+ "enable_wait_mode=off"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
diff --git a/include/configs/mx6dl_sabresd_mfg.h b/include/configs/mx6dl_sabresd_mfg.h
index aee4f38f2a..2d1298b161 100644
--- a/include/configs/mx6dl_sabresd_mfg.h
+++ b/include/configs/mx6dl_sabresd_mfg.h
@@ -116,7 +116,8 @@
#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
-#define CONFIG_BOOTARGS "console=ttymxc0,115200 rdinit=/linuxrc"
+#define CONFIG_BOOTARGS "console=ttymxc0,115200 rdinit=/linuxrc "\
+ "enable_wait_mode=off"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6q_arm2_mfg.h b/include/configs/mx6q_arm2_mfg.h
index 6960a7764a..45d66b42ca 100644
--- a/include/configs/mx6q_arm2_mfg.h
+++ b/include/configs/mx6q_arm2_mfg.h
@@ -111,7 +111,8 @@
#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
-#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc"
+#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\
+ "enable_wait_mode=off"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
diff --git a/include/configs/mx6q_sabreauto_mfg.h b/include/configs/mx6q_sabreauto_mfg.h
index 29a1afb5a9..fa5417f6f2 100644
--- a/include/configs/mx6q_sabreauto_mfg.h
+++ b/include/configs/mx6q_sabreauto_mfg.h
@@ -116,7 +116,8 @@
#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
-#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc"
+#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc " \
+ "enable_wait_mode=off"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6q_sabreauto_spi-nor_mfg.h b/include/configs/mx6q_sabreauto_spi-nor_mfg.h
index bf7ff73a3c..6697ac104f 100644
--- a/include/configs/mx6q_sabreauto_spi-nor_mfg.h
+++ b/include/configs/mx6q_sabreauto_spi-nor_mfg.h
@@ -115,7 +115,8 @@
#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
-#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc spi-nor"
+#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\
+ "enable_wait_mode=off spi-nor"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6q_sabreauto_weimnor_mfg.h b/include/configs/mx6q_sabreauto_weimnor_mfg.h
index cc5044bf89..d3d7ea0282 100644
--- a/include/configs/mx6q_sabreauto_weimnor_mfg.h
+++ b/include/configs/mx6q_sabreauto_weimnor_mfg.h
@@ -116,7 +116,7 @@
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc " \
- "weim-nor"
+ "enable_wait_mode=off weim-nor"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6q_sabrelite_mfg.h b/include/configs/mx6q_sabrelite_mfg.h
index 115b4f5771..20f9537b88 100644
--- a/include/configs/mx6q_sabrelite_mfg.h
+++ b/include/configs/mx6q_sabrelite_mfg.h
@@ -113,7 +113,8 @@
#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */
#define CONFIG_RD_LOADADDR 0x10c00000
-#define CONFIG_BOOTARGS "console=ttymxc1,115200 rdinit=/linuxrc"
+#define CONFIG_BOOTARGS "console=ttymxc1,115200 rdinit=/linuxrc "\
+ "enable_wait_mode=off"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6q_sabresd_mfg.h b/include/configs/mx6q_sabresd_mfg.h
index 62f0c062f2..cbcda718e6 100644
--- a/include/configs/mx6q_sabresd_mfg.h
+++ b/include/configs/mx6q_sabresd_mfg.h
@@ -113,7 +113,8 @@
#define CONFIG_LOADADDR 0x10800000 /* loadaddr env var */
#define CONFIG_RD_LOADADDR 0x10c00000
-#define CONFIG_BOOTARGS "console=ttymxc0,115200 rdinit=/linuxrc"
+#define CONFIG_BOOTARGS "console=ttymxc0,115200 rdinit=/linuxrc "\
+ "enable_wait_mode=off"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6solo_sabreauto_mfg.h b/include/configs/mx6solo_sabreauto_mfg.h
index d7c0c5682b..e921036d4a 100644
--- a/include/configs/mx6solo_sabreauto_mfg.h
+++ b/include/configs/mx6solo_sabreauto_mfg.h
@@ -118,7 +118,7 @@
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\
- "nosmp arm_freq=800"
+ "nosmp arm_freq=800 enable_wait_mode=off"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6solo_sabreauto_spi-nor_mfg.h b/include/configs/mx6solo_sabreauto_spi-nor_mfg.h
index 8ad6b717c0..a757cca3a8 100644
--- a/include/configs/mx6solo_sabreauto_spi-nor_mfg.h
+++ b/include/configs/mx6solo_sabreauto_spi-nor_mfg.h
@@ -117,7 +117,8 @@
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\
- "nosmp arm_freq=800 spi-nor"
+ "enable_wait_mode=off nosmp "\
+ "arm_freq=800 spi-nor"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \
diff --git a/include/configs/mx6solo_sabreauto_weimnor_mfg.h b/include/configs/mx6solo_sabreauto_weimnor_mfg.h
index 52012234c4..8ad560a3b9 100644
--- a/include/configs/mx6solo_sabreauto_weimnor_mfg.h
+++ b/include/configs/mx6solo_sabreauto_weimnor_mfg.h
@@ -118,7 +118,8 @@
#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000)
#define CONFIG_BOOTARGS "console=ttymxc3,115200 rdinit=/linuxrc "\
- "nosmp arm_freq=800 weim-nor"
+ "enable_wait_mode=off nosmp "\
+ "arm_freq=800 weim-nor"
#define CONFIG_BOOTCOMMAND "bootm 0x10800000 0x10c00000"
#define CONFIG_EXTRA_ENV_SETTINGS \