From: Tom Rini Date: Fri, 3 Jul 2015 12:36:29 +0000 (-0400) Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx X-Git-Tag: v2015.07~29 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4;p=oweals%2Fu-boot.git Merge branch 'master' of git://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 --- 808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4 diff --cc configs/tbs2910_defconfig index bb14026597,ed9c70fd5a..f0e5106e8c --- a/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 ceb3386ac5,3fe50dab73..c590354aa8 --- a/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 e413ef4b10,74981bb0b8..7de3f99528 --- a/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 6c37b4f0b1,5cc2234a06..7bf15d174e --- a/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 af7853ff86,a97671c486..ff38d0b914 --- a/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