Merge branch 'master' of git://www.denx.de/git/u-boot-imx

diff --cc arch/arm/dts/Makefile
Simple merge

diff --cc configs/colibri_vf_defconfig
index b2d1ed803f149f38966a04d5b23ae18f4dff7d73,07152671541947c12e66ad35757c128512e3ab0a..5d4f30756dcb68f4225e2ba2c1104e7a6cab473a
--- 1/configs/colibri_vf_defconfig
--- 2/configs/colibri_vf_defconfig
+++ b/configs/colibri_vf_defconfig
@@@ -1,6 -1,6 +1,7 @@@
  CONFIG_ARM=y
  CONFIG_TARGET_COLIBRI_VF=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
 +CONFIG_CMD_NET=y
  CONFIG_NAND_VF610_NFC=y
  CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y
+ CONFIG_DM=y

diff --cc include/configs/colibri_vf.h
Simple merge

diff --cc include/configs/tqma6.h
index 4859e038906b037ff0d16148b032c653474af076,e46c58075e5c0c5dd7caef16fc806dff12b4ff9a..00294f6d5273273eb47aee86e000cdfcb3dc362b
--- 1/include/configs/tqma6.h
--- 2/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@@ -115,14 -123,8 +122,7 @@@
  /* Command definition */
  #define CONFIG_CMD_BMODE
  #define CONFIG_CMD_ITEST
 -#define CONFIG_CMD_SETEXPR
  
- /* place code in last 4 MiB of RAM */
- #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
- #define CONFIG_SYS_TEXT_BASE          0x2fc00000
- #elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D)
- #define CONFIG_SYS_TEXT_BASE          0x4fc00000
- #endif
- 
  #define CONFIG_ENV_SIZE                       (SZ_8K)
  /* Size of malloc() pool */
  #define CONFIG_SYS_MALLOC_LEN         (CONFIG_ENV_SIZE + 2 * SZ_1M)

diff --cc include/configs/wandboard.h
Simple merge

diff --cc include/configs/warp.h
index e38b425215e1b316aaf021864e9ece759dee4a75,296ea83eba10b952584dec78733d77a029edf763..39b49198bffed27e8941e6d83794d605eb35f44d
--- 1/include/configs/warp.h
--- 2/include/configs/warp.h
+++ b/include/configs/warp.h
@@@ -25,11 -25,13 +25,12 @@@
  #define CONFIG_MXC_UART_BASE          UART1_IPS_BASE_ADDR
  
  /* MMC Configs */
- #define CONFIG_SYS_FSL_ESDHC_ADDR     0
+ #define CONFIG_SYS_FSL_ESDHC_ADDR     USDHC2_BASE_ADDR
  #define CONFIG_SYS_FSL_ESDHC_FORCE_VSELECT
  #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE
+ #define CONFIG_SUPPORT_EMMC_BOOT
  
  /* Command definition */
 -#undef CONFIG_CMD_NET
  #undef CONFIG_CMD_NFS
  
  /* Watchdog */