From: Tom Rini <trini@ti.com>
Date: Wed, 5 Nov 2014 17:48:09 +0000 (-0500)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: v2015.01-rc1~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=625509ab0edbb7d943ad9028de3c21ca48aa58be;p=oweals%2Fu-boot.git

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

625509ab0edbb7d943ad9028de3c21ca48aa58be
diff --cc arch/arm/Kconfig
index bd774d42a8,bef298f1bc..22eb2d5854
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -625,11 -413,12 +625,14 @@@ config TARGET_GW_VENTAN
  
  config TARGET_HUMMINGBOARD
  	bool "Support hummingboard"
 +	select CPU_V7
  
+ config TARGET_KOSAGI_NOVENA
+ 	bool "Support Kosagi Novena"
+ 
  config TARGET_TQMA6
  	bool "TQ Systems TQMa6 board"
 +	select CPU_V7
  
  config TARGET_OT1200
  	bool "Bachmann OT1200"
@@@ -892,9 -649,9 +895,10 @@@ source "board/imx31_phycore/Kconfig
  source "board/isee/igep0033/Kconfig"
  source "board/jornada/Kconfig"
  source "board/karo/tx25/Kconfig"
+ source "board/kosagi/novena/Kconfig"
  source "board/logicpd/imx27lite/Kconfig"
  source "board/logicpd/imx31_litekit/Kconfig"
 +source "board/maxbcm/Kconfig"
  source "board/mpl/vcma9/Kconfig"
  source "board/olimex/mx23_olinuxino/Kconfig"
  source "board/palmld/Kconfig"