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

diff --combined arch/arm/Kconfig
index eeeaca4,152a029..49bcad1
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -102,6 -102,11 +102,11 @@@ config KIRKWOO
        bool "Marvell Kirkwood"
        select CPU_ARM926EJS
  
+ config TARGET_DB_88F6820_GP
+       bool "Support DB-88F6820-GP"
+       select CPU_V7
+       select SUPPORT_SPL
+ 
  config TARGET_DB_MV784MP_GP
        bool "Support db-mv784mp-gp"
        select CPU_V7
@@@ -632,11 -637,6 +637,11 @@@ config TARGET_SOCFPGA_CYCLONE
  
  config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
 +      select DM
 +      select DM_GPIO
 +      select OF_CONTROL
 +      select OF_SEPARATE
 +      select SPL_DISABLE_OF_CONTROL
  
  config TARGET_SNOWBALL
        bool "Support snowball"
@@@ -855,6 -855,7 +860,7 @@@ source "board/BuR/kwb/Kconfig
  source "board/BuR/tseries/Kconfig"
  source "board/CarMediaLab/flea3/Kconfig"
  source "board/Marvell/aspenite/Kconfig"
+ source "board/Marvell/db-88f6820-gp/Kconfig"
  source "board/Marvell/db-mv784mp-gp/Kconfig"
  source "board/Marvell/gplugd/Kconfig"
  source "board/altera/socfpga/Kconfig"