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

diff --cc arch/arm/Kconfig
index bd774d42a89fa7c05a14616a35b5adf2acdd49de,bef298f1bcbc924e486ea4331f546d56ae5b098f..22eb2d58545662cead9858f2776234f7832a67af
--- 1/arch/arm/Kconfig
--- 2/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"

diff --cc arch/arm/cpu/armv7/mx6/soc.c
Simple merge

diff --cc board/compulab/cm_fx6/cm_fx6.c
Simple merge

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

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