Merge branch 'master' of git://www.denx.de/git/u-boot-imx
authorTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 16:15:13 +0000 (12:15 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 16:15:13 +0000 (12:15 -0400)
1  2 
arch/arm/Kconfig
include/configs/gw_ventana.h
include/configs/nitrogen6x.h
include/configs/tqma6.h

index 5f21b59ba813be88258a8b31877effd01d19cd0d,7c383cb89ab30cf9b2393b346529704a98a860bd..2167e29f6aba525f61f92635f1017e8699232668
@@@ -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
Simple merge
Simple merge
Simple merge