diff options
author | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:20:55 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:20:55 +0000 |
commit | aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf (patch) | |
tree | 860b1de328ad7bc65fd430ea09368394f024a7e0 /arch/arm/mach-mvebu/Kconfig | |
parent | b92f10be479b3b63e753968a0c6cb3f605ad7142 (diff) | |
parent | 665ca874e1f7f0690a1efa6900e71490c3814fcd (diff) |
Merge branch 'mvebu/soc-3xx' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
-rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 1ba825ee3fe5..4b1eea09ae93 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -21,26 +21,55 @@ if ARCH_MVEBU menu "Marvell EBU SoC variants" -config MACH_ARMADA_370_XP +config MACH_MVEBU_V7 bool select ARMADA_370_XP_TIMER select HAVE_SMP select CACHE_L2X0 - select CPU_PJ4B config MACH_ARMADA_370 bool "Marvell Armada 370 boards" select ARMADA_370_CLK - select MACH_ARMADA_370_XP + select CPU_PJ4B + select MACH_MVEBU_V7 select PINCTRL_ARMADA_370 help Say 'Y' here if you want your kernel to support boards based on the Marvell Armada 370 SoC with device tree. +config MACH_ARMADA_375 + bool "Marvell Armada 375 boards" if ARCH_MULTI_V7 + select ARM_ERRATA_720789 + select ARM_ERRATA_753970 + select ARM_GIC + select ARMADA_375_CLK + select CPU_V7 + select MACH_MVEBU_V7 + select NEON + select PINCTRL_ARMADA_375 + help + Say 'Y' here if you want your kernel to support boards based + on the Marvell Armada 375 SoC with device tree. + +config MACH_ARMADA_38X + bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7 + select ARM_ERRATA_720789 + select ARM_ERRATA_753970 + select ARM_GIC + select ARMADA_38X_CLK + select CPU_V7 + select MACH_MVEBU_V7 + select NEON + select PINCTRL_ARMADA_38X + help + Say 'Y' here if you want your kernel to support boards based + on the Marvell Armada 380/385 SoC with device tree. + config MACH_ARMADA_XP bool "Marvell Armada XP boards" select ARMADA_XP_CLK - select MACH_ARMADA_370_XP + select CPU_PJ4B + select MACH_MVEBU_V7 select PINCTRL_ARMADA_XP help Say 'Y' here if you want your kernel to support boards based |