diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-01-29 11:41:18 +0300 |
| commit | 76b36fa896a2db64582690e085f36adc76604134 (patch) | |
| tree | 78007f123ead6f96cdee6ba98ac3c289c706cc39 /arch/arm/mach-mvebu/Kconfig | |
| parent | 14365449b6ce34cf6a3040ff8ebbb39d89d67159 (diff) | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | linux-76b36fa896a2db64582690e085f36adc76604134.tar.xz | |
Merge tag 'v4.5-rc1' into x86/asm, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index e20fc4178b15..64e3d2ce9a07 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -1,5 +1,6 @@ menuconfig ARCH_MVEBU - bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5) + bool "Marvell Engineering Business Unit (MVEBU) SoCs" + depends on ARCH_MULTI_V7 || ARCH_MULTI_V5 select ARCH_SUPPORTS_BIG_ENDIAN select CLKSRC_MMIO select GENERIC_IRQ_CHIP @@ -25,7 +26,8 @@ config MACH_MVEBU_V7 select MACH_MVEBU_ANY config MACH_ARMADA_370 - bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 + bool "Marvell Armada 370 boards" + depends on ARCH_MULTI_V7 select ARMADA_370_CLK select CPU_PJ4B select MACH_MVEBU_V7 @@ -35,7 +37,8 @@ config MACH_ARMADA_370 on the Marvell Armada 370 SoC with device tree. config MACH_ARMADA_375 - bool "Marvell Armada 375 boards" if ARCH_MULTI_V7 + bool "Marvell Armada 375 boards" + depends on ARCH_MULTI_V7 select ARM_ERRATA_720789 select ARM_ERRATA_753970 select ARM_GIC @@ -50,7 +53,8 @@ config MACH_ARMADA_375 on the Marvell Armada 375 SoC with device tree. config MACH_ARMADA_38X - bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7 + bool "Marvell Armada 380/385 boards" + depends on ARCH_MULTI_V7 select ARM_ERRATA_720789 select ARM_ERRATA_753970 select ARM_GIC @@ -65,7 +69,8 @@ config MACH_ARMADA_38X on the Marvell Armada 380/385 SoC with device tree. config MACH_ARMADA_39X - bool "Marvell Armada 39x boards" if ARCH_MULTI_V7 + bool "Marvell Armada 39x boards" + depends on ARCH_MULTI_V7 select ARM_GIC select ARMADA_39X_CLK select CACHE_L2X0 @@ -79,7 +84,8 @@ config MACH_ARMADA_39X on the Marvell Armada 39x SoC with device tree. config MACH_ARMADA_XP - bool "Marvell Armada XP boards" if ARCH_MULTI_V7 + bool "Marvell Armada XP boards" + depends on ARCH_MULTI_V7 select ARMADA_XP_CLK select CPU_PJ4B select MACH_MVEBU_V7 @@ -89,7 +95,8 @@ config MACH_ARMADA_XP on the Marvell Armada XP SoC with device tree. config MACH_DOVE - bool "Marvell Dove boards" if ARCH_MULTI_V7 + bool "Marvell Dove boards" + depends on ARCH_MULTI_V7 select CACHE_L2X0 select CPU_PJ4 select DOVE_CLK @@ -103,7 +110,8 @@ config MACH_DOVE Marvell Dove using flattened device tree. config MACH_KIRKWOOD - bool "Marvell Kirkwood boards" if ARCH_MULTI_V5 + bool "Marvell Kirkwood boards" + depends on ARCH_MULTI_V5 select ARCH_REQUIRE_GPIOLIB select CPU_FEROCEON select KIRKWOOD_CLK |