diff options
author | Jason Cooper <jason@lakedaemon.net> | 2014-02-23 10:48:25 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-24 12:33:44 -0500 |
commit | 665ca874e1f7f0690a1efa6900e71490c3814fcd (patch) | |
tree | d81b54720973ca1812ea8518560d17b582ba0bae /arch/arm/mach-mvebu/Kconfig | |
parent | bc81526f379c78607e042ec15ebbe7e04c9950d5 (diff) |
ARM: mvebu: Armada 375/38x depend on MULTI_V7
During this release cycle, we're adding the new Armada 375, 380, and 385
SoCs. We're also migrating DT kirkwood boards into mach-mvebu. The
kirkwood changes make the different SoCs in mach-mvebu/ depend on
MULTI_V7 or MULTI_V5 as appropriate.
We add this dependency to the new SoCs so that when the branches are
merged, everything is as it should be.
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
-rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 884b275ab056..00dc4a6ace6e 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
@@ -38,7 +38,7 @@ config MACH_ARMADA_370 | |||
38 | on the Marvell Armada 370 SoC with device tree. | 38 | on the Marvell Armada 370 SoC with device tree. |
39 | 39 | ||
40 | config MACH_ARMADA_375 | 40 | config MACH_ARMADA_375 |
41 | bool "Marvell Armada 375 boards" | 41 | bool "Marvell Armada 375 boards" if ARCH_MULTI_V7 |
42 | select ARM_ERRATA_720789 | 42 | select ARM_ERRATA_720789 |
43 | select ARM_ERRATA_753970 | 43 | select ARM_ERRATA_753970 |
44 | select ARM_GIC | 44 | select ARM_GIC |
@@ -52,7 +52,7 @@ config MACH_ARMADA_375 | |||
52 | on the Marvell Armada 375 SoC with device tree. | 52 | on the Marvell Armada 375 SoC with device tree. |
53 | 53 | ||
54 | config MACH_ARMADA_38X | 54 | config MACH_ARMADA_38X |
55 | bool "Marvell Armada 380/385 boards" | 55 | bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7 |
56 | select ARM_ERRATA_720789 | 56 | select ARM_ERRATA_720789 |
57 | select ARM_ERRATA_753970 | 57 | select ARM_ERRATA_753970 |
58 | select ARM_GIC | 58 | select ARM_GIC |