summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-10-20 21:59:40 -0400
committerTom Rini <trini@konsulko.com>2015-10-20 21:59:40 -0400
commite8d124fae0f3dff87348c989aa65ecf9b6eadc14 (patch)
treeff4f4709e54cde4d97349463c335d00f2d631e42 /arch/arm/Kconfig
parentfd8133b725198978865ead730ff20d3991e05f20 (diff)
parent5b37212a3d78f546b5ef3f97a75155b3a0fd88cb (diff)
downloadtalos-obmc-uboot-e8d124fae0f3dff87348c989aa65ecf9b6eadc14.tar.gz
talos-obmc-uboot-e8d124fae0f3dff87348c989aa65ecf9b6eadc14.zip
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig20
1 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9bc59465a3..2632099874 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -105,20 +105,14 @@ config KIRKWOOD
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
- select SUPPORT_SPL
-
-config TARGET_MAXBCM
- bool "Support maxbcm"
+config ARCH_MVEBU
+ bool "Marvell MVEBU family (Armada XP/38x)"
select CPU_V7
select SUPPORT_SPL
+ select OF_CONTROL
+ select OF_SEPARATE
+ select DM
+ select DM_SERIAL
config TARGET_DEVKIT3250
bool "Support devkit3250"
@@ -686,6 +680,8 @@ source "arch/arm/mach-keystone/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig"
+source "arch/arm/mach-mvebu/Kconfig"
+
source "arch/arm/cpu/armv7/mx7/Kconfig"
source "arch/arm/cpu/armv7/mx6/Kconfig"
OpenPOWER on IntegriCloud