From: Tom Rini <trini@ti.com>
Date: Fri, 14 Nov 2014 18:53:49 +0000 (-0500)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: v2015.01-rc2~79
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45043cf804763d4cf93fec93d8294e385f87622a;p=pandora-u-boot.git

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

45043cf804763d4cf93fec93d8294e385f87622a
diff --cc arch/arm/Kconfig
index 3955978fbed,1922fb0d2c5..bd073ebd287
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -632,9 -630,10 +633,12 @@@ config TARGET_HUMMINGBOAR
  
  config TARGET_KOSAGI_NOVENA
  	bool "Support Kosagi Novena"
 +	select CPU_V7
 +	select SUPPORT_SPL
  
+ config TARGET_TBS2910
+ 	bool "Support tbs2910"
+ 
  config TARGET_TQMA6
  	bool "TQ Systems TQMa6 board"
  	select CPU_V7