aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig14
-rw-r--r--arch/arm/Makefile1
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a91009c61870..e7fbe53cbbf5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -533,6 +533,18 @@ config ARCH_IXP4XX
533 help 533 help
534 Support for Intel's IXP4XX (XScale) family of processors. 534 Support for Intel's IXP4XX (XScale) family of processors.
535 535
536config ARCH_MVEBU
537 bool "Marvell SOCs with Device Tree support"
538 select GENERIC_CLOCKEVENTS
539 select MULTI_IRQ_HANDLER
540 select SPARSE_IRQ
541 select CLKSRC_MMIO
542 select GENERIC_IRQ_CHIP
543 select IRQ_DOMAIN
544 select COMMON_CLK
545 help
546 Support for the Marvell SoC Family with device tree support
547
536config ARCH_DOVE 548config ARCH_DOVE
537 bool "Marvell Dove" 549 bool "Marvell Dove"
538 select CPU_V7 550 select CPU_V7
@@ -987,6 +999,8 @@ endchoice
987# Kconfigs may be included either alphabetically (according to the 999# Kconfigs may be included either alphabetically (according to the
988# plat- suffix) or along side the corresponding mach-* source. 1000# plat- suffix) or along side the corresponding mach-* source.
989# 1001#
1002source "arch/arm/mach-mvebu/Kconfig"
1003
990source "arch/arm/mach-at91/Kconfig" 1004source "arch/arm/mach-at91/Kconfig"
991 1005
992source "arch/arm/mach-bcmring/Kconfig" 1006source "arch/arm/mach-bcmring/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 0298b00fe241..f1a1a7170103 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -157,6 +157,7 @@ machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
157machine-$(CONFIG_ARCH_IMX_V4_V5) := imx 157machine-$(CONFIG_ARCH_IMX_V4_V5) := imx
158machine-$(CONFIG_ARCH_IMX_V6_V7) := imx 158machine-$(CONFIG_ARCH_IMX_V6_V7) := imx
159machine-$(CONFIG_ARCH_MXS) := mxs 159machine-$(CONFIG_ARCH_MXS) := mxs
160machine-$(CONFIG_ARCH_MVEBU) := mvebu
160machine-$(CONFIG_ARCH_NETX) := netx 161machine-$(CONFIG_ARCH_NETX) := netx
161machine-$(CONFIG_ARCH_NOMADIK) := nomadik 162machine-$(CONFIG_ARCH_NOMADIK) := nomadik
162machine-$(CONFIG_ARCH_OMAP1) := omap1 163machine-$(CONFIG_ARCH_OMAP1) := omap1