diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-01 03:21:04 +0000 |
| commit | 0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e (patch) | |
| tree | 35e597b44cd1af328cb6b02e4f16de51ccd6f979 /arch/arm/mach-mvebu/Kconfig | |
| parent | aa89b0ad4f9cac3925bd8e85dbfc3c50ba7b31cf (diff) | |
| parent | b02b64384696ad13d6a827dc7775489d01b3dfd9 (diff) | |
Merge branch 'mvebu/soc-kw' into mvebu/soc
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 4b1eea09ae93..4cfc4d8abcac 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -1,5 +1,5 @@ config ARCH_MVEBU - bool "Marvell Engineering Business Unit (MVEBU) SoCs" if ARCH_MULTI_V7 + bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5) select ARCH_SUPPORTS_BIG_ENDIAN select CLKSRC_MMIO select COMMON_CLK @@ -28,7 +28,7 @@ config MACH_MVEBU_V7 select CACHE_L2X0 config MACH_ARMADA_370 - bool "Marvell Armada 370 boards" + bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 select ARMADA_370_CLK select CPU_PJ4B select MACH_MVEBU_V7 @@ -66,7 +66,7 @@ config MACH_ARMADA_38X on the Marvell Armada 380/385 SoC with device tree. config MACH_ARMADA_XP - bool "Marvell Armada XP boards" + bool "Marvell Armada XP boards" if ARCH_MULTI_V7 select ARMADA_XP_CLK select CPU_PJ4B select MACH_MVEBU_V7 @@ -75,6 +75,30 @@ config MACH_ARMADA_XP Say 'Y' here if you want your kernel to support boards based on the Marvell Armada XP SoC with device tree. +config MACH_KIRKWOOD + bool "Marvell Kirkwood boards" if ARCH_MULTI_V5 + select ARCH_HAS_CPUFREQ + select ARCH_REQUIRE_GPIOLIB + select CPU_FEROCEON + select KIRKWOOD_CLK + select OF_IRQ + select ORION_IRQCHIP + select ORION_TIMER + select PCI + select PCI_QUIRKS + select PINCTRL_KIRKWOOD + select USE_OF + help + Say 'Y' here if you want your kernel to support boards based + on the Marvell Kirkwood device tree. + +config MACH_T5325 + bool "HP T5325 thin client" + depends on MACH_KIRKWOOD + help + Say 'Y' here if you want your kernel to support the + HP T5325 Thin client + endmenu endif |