From: Tom Rini <trini@konsulko.com>
Date: Tue, 28 Apr 2015 16:15:13 +0000 (-0400)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: v2015.07-rc1~63
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e536ab8849b2b4f6d68bbc8e1d1f9bc033db06bd;p=oweals%2Fu-boot.git

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

e536ab8849b2b4f6d68bbc8e1d1f9bc033db06bd
diff --cc arch/arm/Kconfig
index 5f21b59ba8,7c383cb89a..2167e29f6a
--- a/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