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

diff --combined arch/arm/Kconfig
index c0b68cbf06f1140cbff53de74a51caf6a896f580,c026dec0ac928d04982a70ad82ce40ae0d33c766..2b0d2c933895c3c07cec7ec1af8fe8e47f3cba4d
--- 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
@@@ -654,7 -650,6 +654,7 @@@ config TARGET_KOSAGI_NOVEN
  
  config TARGET_TBS2910
        bool "Support tbs2910"
 +      select CPU_V7
  
  config TARGET_TQMA6
        bool "TQ Systems TQMa6 board"
@@@ -733,12 -728,14 +733,14 @@@ config TARGET_LS2085A_SIM
        select ARM64
  
  config TARGET_LS1021AQDS
-       bool "Support ls1021aqds_nor"
+       bool "Support ls1021aqds"
        select CPU_V7
+       select SUPPORT_SPL
  
  config TARGET_LS1021ATWR
-       bool "Support ls1021atwr_nor"
+       bool "Support ls1021atwr"
        select CPU_V7
+       select SUPPORT_SPL
  
  config TARGET_BALLOON3
        bool "Support balloon3"
@@@ -958,7 -955,6 +960,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"