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

diff --combined arch/arm/Kconfig
index 6881f36f1ffaa2e509d0bf0c7960451f7b9eb596,be703af3569f843d412e6787642fe3a2fc46f149..c0b68cbf06f1140cbff53de74a51caf6a896f580
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -341,10 -341,6 +341,10 @@@ config TARGET_SPEAR60
        bool "Support spear600"
        select CPU_ARM926EJS
  
 +config TARGET_STV0991
 +      bool "Support stv0991"
 +      select CPU_V7
 +
  config TARGET_X600
        bool "Support x600"
        select CPU_ARM926EJS
@@@ -400,8 -396,8 +400,8 @@@ config TARGET_MX35PD
        bool "Support mx35pdk"
        select CPU_ARM1136
  
 -config TARGET_RPI_B
 -      bool "Support rpi_b"
 +config TARGET_RPI
 +      bool "Support rpi"
        select CPU_ARM1176
  
  config TARGET_TNETV107X_EVM
@@@ -654,6 -650,7 +654,7 @@@ config TARGET_KOSAGI_NOVEN
  
  config TARGET_TBS2910
        bool "Support tbs2910"
+       select CPU_V7
  
  config TARGET_TQMA6
        bool "TQ Systems TQMa6 board"
@@@ -797,7 -794,6 +798,7 @@@ config ARCH_UNIPHIE
        bool "Panasonic UniPhier platform"
        select CPU_V7
        select SUPPORT_SPL
 +      select OF_CONTROL if !SPL_BUILD
  
  endchoice
  
@@@ -935,7 -931,7 +936,7 @@@ source "board/palmtreo680/Kconfig
  source "board/phytec/pcm051/Kconfig"
  source "board/ppcag/bg0900/Kconfig"
  source "board/pxa255_idp/Kconfig"
 -source "board/raspberrypi/rpi_b/Kconfig"
 +source "board/raspberrypi/rpi/Kconfig"
  source "board/ronetix/pm9261/Kconfig"
  source "board/ronetix/pm9263/Kconfig"
  source "board/ronetix/pm9g45/Kconfig"
@@@ -957,7 -953,6 +958,7 @@@ source "board/spear/spear600/Kconfig
  source "board/spear/x600/Kconfig"
  source "board/st-ericsson/snowball/Kconfig"
  source "board/st-ericsson/u8500/Kconfig"
 +source "board/st/stv0991/Kconfig"
  source "board/sunxi/Kconfig"
  source "board/syteco/jadecpu/Kconfig"
  source "board/syteco/zmx25/Kconfig"