Merge remote-tracking branch 'u-boot-imx/master'

diff --combined include/configs/mx51evk.h
index dcae537,d3edcba..225d359
--- 1/include/configs/mx51evk.h
--- 2/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@@ -96,7 -96,6 +96,6 @@@
  /*
   * Eth Configs
   */
- #define CONFIG_HAS_ETH1
  #define CONFIG_MII
  
  #define CONFIG_FEC_MXC
@@@ -182,7 -181,7 +181,7 @@@
                "dhcp ${uimage}; bootm\0" \
  
  #define CONFIG_BOOTCOMMAND \
 -      "if mmc rescan ${mmcdev}; then " \
 +      "mmc dev ${mmcdev}; if mmc rescan; then " \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \

diff --combined include/configs/mx53evk.h
index 69937d8,8fc415e..d1f684c
--- 1/include/configs/mx53evk.h
--- 2/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@@ -73,7 -73,6 +73,6 @@@
  #define CONFIG_DOS_PARTITION
  
  /* Eth Configs */
- #define CONFIG_HAS_ETH1
  #define CONFIG_MII
  
  #define CONFIG_FEC_MXC
@@@ -132,7 -131,7 +131,7 @@@
                "dhcp ${uimage}; bootm\0" \
  
  #define CONFIG_BOOTCOMMAND \
 -      "if mmc rescan ${mmcdev}; then " \
 +      "mmc dev ${mmcdev}; if mmc rescan; then " \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \

diff --combined include/configs/mx53loco.h
index 55efeb7,0658dd3..a1b27ce
--- 1/include/configs/mx53loco.h
--- 2/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@@ -58,7 -58,6 +58,6 @@@
  #define CONFIG_DOS_PARTITION
  
  /* Eth Configs */
- #define CONFIG_HAS_ETH1
  #define CONFIG_MII
  
  #define CONFIG_FEC_MXC
@@@ -140,7 -139,7 +139,7 @@@
                "dhcp ${uimage}; bootm\0" \
  
  #define CONFIG_BOOTCOMMAND \
 -      "if mmc rescan ${mmcdev}; then " \
 +      "mmc dev ${mmcdev}; if mmc rescan; then " \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \
@@@ -222,6 -221,6 +221,6 @@@
  #define CONFIG_SPLASH_SCREEN
  #define CONFIG_BMP_16BPP
  #define CONFIG_VIDEO_LOGO
- #define CONFIG_IPUV3_CLK      133000000
+ #define CONFIG_IPUV3_CLK      200000000
  
  #endif                                /* __CONFIG_H */

diff --combined include/configs/mx6qarm2.h
index fbc5162,b425fed..23562a8
--- 1/include/configs/mx6qarm2.h
--- 2/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@@ -50,6 -50,7 +50,7 @@@
  #define CONFIG_MMC
  #define CONFIG_CMD_MMC
  #define CONFIG_GENERIC_MMC
+ #define CONFIG_MMC_BOUNCE_BUFFER
  #define CONFIG_CMD_FAT
  #define CONFIG_DOS_PARTITION
  
@@@ -106,7 -107,7 +107,7 @@@
  
  #define CONFIG_BOOTCOMMAND \
        "mmc dev ${mmcdev};" \
 -      "if mmc rescan ${mmcdev}; then " \
 +      "mmc dev ${mmcdev}; if mmc rescan; then " \
                "if run loadbootscript; then " \
                        "run bootscript; " \
                "else " \
@@@ -164,6 -165,4 +165,4 @@@
  #define CONFIG_OF_LIBFDT
  #define CONFIG_CMD_BOOTZ
  
- #define CONFIG_SYS_DCACHE_OFF
- 
  #endif                                /* __CONFIG_H */

diff --combined include/configs/mx6qsabrelite.h
index ec9ab26,5989eb2..b56d7ca
--- 1/include/configs/mx6qsabrelite.h
--- 2/include/configs/mx6qsabrelite.h
+++ b/include/configs/mx6qsabrelite.h
@@@ -37,7 -37,7 +37,7 @@@
  #define CONFIG_REVISION_TAG
  
  /* Size of malloc() pool */
- #define CONFIG_SYS_MALLOC_LEN        (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
+ #define CONFIG_SYS_MALLOC_LEN         (10 * 1024 * 1024)
  
  #define CONFIG_BOARD_EARLY_INIT_F
  #define CONFIG_MISC_INIT_R
@@@ -72,6 -72,7 +72,7 @@@
  #define CONFIG_MMC
  #define CONFIG_CMD_MMC
  #define CONFIG_GENERIC_MMC
+ #define CONFIG_MMC_BOUNCE_BUFFER
  #define CONFIG_CMD_EXT2
  #define CONFIG_CMD_FAT
  #define CONFIG_DOS_PARTITION
@@@ -119,6 -120,19 +120,19 @@@
  /* Miscellaneous commands */
  #define CONFIG_CMD_BMODE
  
+ /* Framebuffer and LCD */
+ #define CONFIG_VIDEO
+ #define CONFIG_VIDEO_IPUV3
+ #define CONFIG_CFB_CONSOLE
+ #define CONFIG_VGA_AS_SINGLE_DEVICE
+ #define CONFIG_SYS_CONSOLE_IS_IN_ENV
+ #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
+ #define CONFIG_VIDEO_BMP_RLE8
+ #define CONFIG_SPLASH_SCREEN
+ #define CONFIG_BMP_16BPP
+ #define CONFIG_VIDEO_LOGO
+ #define CONFIG_IPUV3_CLK 260000000
+ 
  /* allow to overwrite serial and ethaddr */
  #define CONFIG_ENV_OVERWRITE
  #define CONFIG_CONS_INDEX            1
@@@ -164,7 -178,7 +178,7 @@@
  
  #define CONFIG_BOOTCOMMAND \
         "mmc dev ${mmcdev};" \
 -       "if mmc rescan ${mmcdev}; then " \
 +       "mmc dev ${mmcdev}; if mmc rescan; then " \
               "if run loadbootscript; then " \
                       "run bootscript; " \
               "else " \
@@@ -234,8 -248,6 +248,6 @@@
  #define CONFIG_OF_LIBFDT
  #define CONFIG_CMD_BOOTZ
  
- #define CONFIG_SYS_DCACHE_OFF
- 
  #ifndef CONFIG_SYS_DCACHE_OFF
  #define CONFIG_CMD_CACHE
  #endif