From: Tom Rini <trini@konsulko.com>
Date: Mon, 8 Jun 2015 12:37:02 +0000 (-0400)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: v2015.07-rc2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4d80051b63ff54f6b6f90fceb92cf87ab3401ecb;p=u-boot

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

4d80051b63ff54f6b6f90fceb92cf87ab3401ecb
diff --cc configs/colibri_vf_defconfig
index b2d1ed803f,0715267154..5d4f30756d
--- a/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/tqma6.h
index 4859e03890,e46c58075e..00294f6d52
--- a/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/warp.h
index e38b425215,296ea83eba..39b49198bf
--- a/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 */