Merge git://git.denx.de/u-boot-socfpga

diff --combined arch/arm/Kconfig
index 27bcc2d,452a843..72e7981
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -381,19 -381,6 +381,19 @@@ config TARGET_AM43XX_EV
        select CPU_V7
        select SUPPORT_SPL
  
 +config TARGET_BAV335X
 +      bool "Support bav335x"
 +      select CPU_V7
 +      select SUPPORT_SPL
 +      help
 +        The BAV335x OEM Network Processor integrates all the functions of an
 +        embedded network computer in a small, easy to use SODIMM module which
 +        incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
 +        processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
 +        ethernet with simple connection to external connectors.
 +
 +        For more information, visit: http://birdland.com/oem
 +
  config TARGET_TI814X_EVM
        bool "Support ti814x_evm"
        select CPU_V7
@@@ -478,10 -465,6 +478,10 @@@ config TARGET_WANDBOAR
        bool "Support wandboard"
        select CPU_V7
  
 +config TARGET_WARP
 +      bool "Support WaRP"
 +      select CPU_V7
 +
  config TARGET_TITANIUM
        bool "Support titanium"
        select CPU_V7
@@@ -584,6 -567,11 +584,11 @@@ config TARGET_CM_FX
        select CPU_V7
        select SUPPORT_SPL
  
+ config TARGET_SOCFPGA_ARRIA5
+       bool "Support socfpga_arria5"
+       select CPU_V7
+       select SUPPORT_SPL
+ 
  config TARGET_SOCFPGA_CYCLONE5
        bool "Support socfpga_cyclone5"
        select CPU_V7
@@@ -849,7 -837,6 +854,7 @@@ source "board/syteco/zmx25/Kconfig
  source "board/tbs/tbs2910/Kconfig"
  source "board/ti/am335x/Kconfig"
  source "board/ti/am43xx/Kconfig"
 +source "board/birdland/bav335x/Kconfig"
  source "board/ti/ti814x/Kconfig"
  source "board/ti/ti816x/Kconfig"
  source "board/timll/devkit3250/Kconfig"
@@@ -860,7 -847,6 +865,7 @@@ source "board/ttcontrol/vision2/Kconfig
  source "board/udoo/Kconfig"
  source "board/vpac270/Kconfig"
  source "board/wandboard/Kconfig"
 +source "board/warp/Kconfig"
  source "board/woodburn/Kconfig"
  source "board/xaeniax/Kconfig"
  source "board/xilinx/zynqmp/Kconfig"