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 --combined arch/arm/Kconfig
index 192d9cf3f078d0beb0bdf7ae397af98c484ba02f,3e07eccb40c671950f9029e2b16ff6604c85343f..9908b430d62df47462cb31f318129fc054fc176b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -346,13 -346,8 +346,13 @@@ config TARGET_DRAC
        select CPU_V7
        select SUPPORT_SPL
  
 -config TARGET_DXR2
 -      bool "Support dxr2"
 +config TARGET_THUBAN
 +      bool "Support thuban"
 +      select CPU_V7
 +      select SUPPORT_SPL
 +
 +config TARGET_RASTABAN
 +      bool "Support rastaban"
        select CPU_V7
        select SUPPORT_SPL
  
@@@ -374,14 -369,6 +374,14 @@@ config TARGET_PENGWY
        select DM_SERIAL
        select DM_GPIO
  
 +config TARGET_AM335X_BALTOS
 +      bool "Support am335x_baltos"
 +      select CPU_V7
 +      select SUPPORT_SPL
 +      select DM
 +      select DM_SERIAL
 +      select DM_GPIO
 +
  config TARGET_AM335X_EVM
        bool "Support am335x_evm"
        select CPU_V7
@@@ -589,10 -576,6 +589,6 @@@ config TARGET_TBS291
        bool "Support tbs2910"
        select CPU_V7
  
- config TARGET_TQMA6
-       bool "TQ Systems TQMa6 board"
-       select CPU_V7
- 
  config TARGET_OT1200
        bool "Bachmann OT1200"
        select CPU_V7
@@@ -670,11 -653,7 +666,11 @@@ config ARCH_ZYN
        bool "Xilinx Zynq Platform"
        select CPU_V7
        select SUPPORT_SPL
 +      select OF_CONTROL
 +      select SPL_DISABLE_OF_CONTROL
        select DM
 +      select DM_SPI
 +      select DM_SPI_FLASH
  
  config TARGET_XILINX_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
@@@ -976,12 -955,10 +972,11 @@@ source "board/ti/ti816x/Kconfig
  source "board/timll/devkit3250/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
  source "board/toradex/colibri_vf/Kconfig"
- source "board/tqc/tqma6/Kconfig"
  source "board/trizepsiv/Kconfig"
  source "board/ttcontrol/vision2/Kconfig"
  source "board/udoo/Kconfig"
  source "board/vpac270/Kconfig"
 +source "board/vscom/baltos/Kconfig"
  source "board/wandboard/Kconfig"
  source "board/warp/Kconfig"
  source "board/woodburn/Kconfig"

diff --combined 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 --combined 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 --combined 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 --combined 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 --combined 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 --combined include/configs/colibri_vf.h
index aff2810a051d9b0e582504ec0fc67e31e56f2000,d01c69307f0cd5c7715fd174402a53f4bd6f322c..f2f8e2ee4d0d25eed87e182a6eb8e75301df1424
--- 1/include/configs/colibri_vf.h
--- 2/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@@ -13,6 -13,7 +13,6 @@@
  #define __CONFIG_H
  
  #include <asm/arch/imx-regs.h>
 -#include <config_cmd_default.h>
  
  #define CONFIG_VF610
  #define CONFIG_SYS_THUMB_BUILD
@@@ -69,6 -70,7 +69,6 @@@
                                "512k(u-boot-env),"             \
                                "-(ubi)"
  
 -#undef CONFIG_CMD_IMLS
  
  #define CONFIG_MMC
  #define CONFIG_FSL_ESDHC
@@@ -179,7 -181,7 +179,7 @@@
  #define CONFIG_SYS_PROMPT_HUSH_PS2    "> "
  #define CONFIG_SYS_PROMPT             "Colibri VFxx # "
  #undef CONFIG_AUTO_COMPLETE
- #define CONFIG_SYS_CBSIZE             256     /* Console I/O Buffer Size */
+ #define CONFIG_SYS_CBSIZE             1024    /* Console I/O Buffer Size */
  #define CONFIG_SYS_PBSIZE             \
                        (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
  #define CONFIG_SYS_MAXARGS            16      /* max number of command args */

diff --combined include/configs/mx6_common.h
index 2ef3201de18cf3117cf8574d8347d5c6557e5734,b37477a02b504a0511632f33d33db196f590b969..86d7b1677750a584ce942a512b9bc0be50e9770b
--- 1/include/configs/mx6_common.h
--- 2/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@@ -36,6 -36,7 +36,6 @@@
  #include <linux/sizes.h>
  #include <asm/arch/imx-regs.h>
  #include <asm/imx-common/gpio.h>
 -#include <config_cmd_default.h>
  
  #ifndef CONFIG_MX6
  #define CONFIG_MX6
@@@ -86,7 -87,7 +86,7 @@@
  #define CONFIG_CMD_FAT
  
  /* Miscellaneous configurable options */
- #define CONFIG_SYS_NO_FLASH
+ #undef CONFIG_CMD_IMLS
  #define CONFIG_SYS_LONGHELP
  #define CONFIG_SYS_HUSH_PARSER
  #define CONFIG_CMDLINE_EDITING

diff --combined include/configs/tqma6.h
index 78a8e399c68fabf7778959df3578ae59e02ee7ac,aa19f1163fd99a48dfa5fb4d21dfbd16259eba40..e0c4ada711dde9b9a46294dd9e913cc50991969d
--- 1/include/configs/tqma6.h
--- 2/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@@ -9,6 -9,7 +9,7 @@@
  #ifndef __CONFIG_H
  #define __CONFIG_H
  
+ #include <linux/kconfig.h>
  /* SPL */
  /* #if defined(CONFIG_SPL_BUILD) */
  
@@@ -47,6 -48,7 +48,6 @@@
  #define CONFIG_MXC_SPI
  
  /* SPI Flash */
 -#define CONFIG_SPI_FLASH
  #define CONFIG_SPI_FLASH_STMICRO
  
  #define TQMA6_SPI_FLASH_SECTOR_SIZE   SZ_64K
@@@ -120,6 -122,7 +121,6 @@@
  
  /* Command definition */
  #define CONFIG_CMD_BMODE
 -#define CONFIG_CMD_ITEST
  
  #define CONFIG_ENV_SIZE                       (SZ_8K)
  /* Size of malloc() pool */