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 bb14026,ed9c70f..f0e5106
--- 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 ceb3386,3fe50da..c590354
--- 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 e413ef4,74981bb..7de3f99
--- 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 6c37b4f,5cc2234..7bf15d1
--- 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 af7853f,a97671c..ff38d0b
--- 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