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

Conflicts:
	configs/tbs2910_defconfig
	configs/tqma6q_mba6_mmc_defconfig
	configs/tqma6q_mba6_spi_defconfig
	configs/tqma6s_mba6_mmc_defconfig
	configs/tqma6s_mba6_spi_defconfig
	include/configs/mx6_common.h

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc configs/tbs2910_defconfig
index bb1402659797dcb79927219c3e46ef30859fcde6,ed9c70fd5ab041287118f2d9af4d4671e0463e88..f0e5106e8c14f5f4bbb0bbe3a632daf282265741
--- 1/configs/tbs2910_defconfig
--- 2/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@@ -1,5 -1,7 +1,7 @@@
  CONFIG_ARM=y
  CONFIG_TARGET_TBS2910=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q"
 -CONFIG_CMD_SETEXPR=y
 -CONFIG_CMD_NET=y
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
+ CONFIG_DM=y
+ CONFIG_DM_THERMAL=y

diff --cc configs/tqma6q_mba6_mmc_defconfig
index ceb3386ac5164d09347f8b902d90a56b450b1c97,3fe50dab736c5aa14013d9f720b9008f58d5f08f..c590354aa84d795b7e76e82df053eb59775577b2
--- 1/configs/tqma6q_mba6_mmc_defconfig
--- 2/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@@ -1,6 -1,5 +1,6 @@@
  CONFIG_ARM=y
+ CONFIG_ARCH_MX6=y
  CONFIG_TARGET_TQMA6=y
- CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT"
 -CONFIG_CMD_SETEXPR=y
 -CONFIG_CMD_NET=y
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_SPI_FLASH=y

diff --cc configs/tqma6q_mba6_spi_defconfig
index e413ef4b1017367a81df3edd8f8e6392b62422cd,74981bb0b8fd0ed3504cb29272c4edf09d82c9cb..7de3f995287e9a4882f8bd2391d40d3ce20d9d1f
--- 1/configs/tqma6q_mba6_spi_defconfig
--- 2/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@@ -1,6 -1,6 +1,7 @@@
  CONFIG_ARM=y
+ CONFIG_ARCH_MX6=y
  CONFIG_TARGET_TQMA6=y
- CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT"
+ CONFIG_TQMA6X_SPI_BOOT=y
 -CONFIG_CMD_SETEXPR=y
 -CONFIG_CMD_NET=y
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_SPI_FLASH=y

diff --cc configs/tqma6s_mba6_mmc_defconfig
index 6c37b4f0b1ac4df4b61db50a688d8a10e5996d69,5cc2234a0635073d0c6a70fb8c3ed097b79acb37..7bf15d174e1feb3041eb279aa470e641379f7696
--- 1/configs/tqma6s_mba6_mmc_defconfig
--- 2/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@@ -1,6 -1,6 +1,7 @@@
  CONFIG_ARM=y
+ CONFIG_ARCH_MX6=y
  CONFIG_TARGET_TQMA6=y
- CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT"
+ CONFIG_TQMA6S=y
 -CONFIG_CMD_SETEXPR=y
 -CONFIG_CMD_NET=y
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_SPI_FLASH=y

diff --cc configs/tqma6s_mba6_spi_defconfig
index af7853ff86ae572cff415ec753a7e72fcb3c4eb8,a97671c486452f1fe26c39ad1f607800055eb5bd..ff38d0b914a8a0d11c05f8493f4697d530671f22
--- 1/configs/tqma6s_mba6_spi_defconfig
--- 2/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@@ -1,6 -1,7 +1,8 @@@
  CONFIG_ARM=y
+ CONFIG_ARCH_MX6=y
  CONFIG_TARGET_TQMA6=y
- CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT"
+ CONFIG_TQMA6S=y
+ CONFIG_TQMA6X_SPI_BOOT=y
 -CONFIG_CMD_SETEXPR=y
 -CONFIG_CMD_NET=y
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_SPI_FLASH=y

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

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

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