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

diff --cc arch/arm/Kconfig
index 5f21b59ba813be88258a8b31877effd01d19cd0d,7c383cb89ab30cf9b2393b346529704a98a860bd..2167e29f6aba525f61f92635f1017e8699232668
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -532,9 -522,12 +532,14 @@@ config TARGET_MX6SABRES
        bool "Support mx6sabresd"
        select CPU_V7
        select SUPPORT_SPL
 +      select DM
 +      select DM_THERMAL
  
+ config TARGET_MX6CUBOXI
+       bool "Support Solid-run mx6 boards"
+       select CPU_V7
+       select SUPPORT_SPL
+ 
  config TARGET_MX6SLEVK
        bool "Support mx6slevk"
        select CPU_V7

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

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

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