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

Conflicts:
	arch/arm/Kconfig

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc arch/arm/Kconfig
index 52b300d4831d81922b83fbe46ba20e478f377207,82e6f2dc91e4cee31921802c4ff53718c85bc4a7..dd9cac91e7e77c43411505d31976e75a81a58472
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -117,8 -117,13 +117,14 @@@ config ARCH_MVEB
        select OF_CONTROL
        select OF_SEPARATE
        select DM
+       select DM_ETH
        select DM_SERIAL
+       select DM_SPI
+       select DM_SPI_FLASH
+       select SPL_DM
 +      select SPL_DM_SEQ_ALIAS
+       select SPL_OF_CONTROL
+       select SPL_SIMPLE_BUS
  
  config TARGET_DEVKIT3250
        bool "Support devkit3250"