From: Tom Rini <trini@konsulko.com>
Date: Thu, 14 Jan 2016 16:23:05 +0000 (-0500)
Subject: Merge git://www.denx.de/git/u-boot-marvell
X-Git-Tag: v2016.03-rc1~313
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f46c25583a73042edf432b209ee4b93bc3f7e762;p=u-boot

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

Conflicts:
	arch/arm/Kconfig

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

f46c25583a73042edf432b209ee4b93bc3f7e762
diff --cc arch/arm/Kconfig
index 52b300d483,82e6f2dc91..dd9cac91e7
--- a/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"