diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/mx6dl_arm2_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6dl_sabresd_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6q_arm2_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6q_sabreauto_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6q_sabreauto_spi-nor_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6q_sabreauto_weimnor_mfg.h | 2 | ||||
-rw-r--r-- | include/configs/mx6q_sabrelite_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6q_sabresd_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6solo_sabreauto_mfg.h | 2 | ||||
-rw-r--r-- | include/configs/mx6solo_sabreauto_spi-nor_mfg.h | 3 | ||||
-rw-r--r-- | include/configs/mx6solo_sabreauto_weimnor_mfg.h | 3 |
11 files changed, 20 insertions, 11 deletions
diff --git a/include/configs/mx6dl_arm2_mfg.h b/include/configs/mx6dl_arm2_mfg.h index aa6d0dc5e41..f645b5326fa 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 aee4f38f2aa..2d1298b1613 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 6960a7764a5..45d66b42ca4 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 29a1afb5a9c..fa5417f6f24 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 bf7ff73a3c0..6697ac104f8 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 cc5044bf89e..d3d7ea02822 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 115b4f5771f..20f9537b88a 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 62f0c062f27..cbcda718e6f 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 d7c0c5682b3..e921036d4a9 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 8ad6b717c0f..a757cca3a8e 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 52012234c46..8ad560a3b94 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 \ |