diff options
author | Andrew Lunn <andrew@lunn.ch> | 2014-02-22 14:14:50 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-02-22 15:42:37 -0500 |
commit | c15ebc714e34a9ba6c9bcd2c74d2cbb157fa8845 (patch) | |
tree | 85516ea14cf8a2e389afdb210264f24cccf8a538 | |
parent | d364eecf7ac632ec8db6cbee2c2ddee48c488b98 (diff) |
ARM: mvebu: Add ARCH_MULTI_V7 to SoCs
Prepare mach-mvebu to house both ARCH_MULTI_V7 and ARCH_MULTI_V5
systems by adding ARCH_MULTI_V7 to the existing SOCs.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-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 1ba825ee3fe5..6c0824ef6d03 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig | |||
@@ -29,7 +29,7 @@ config MACH_ARMADA_370_XP | |||
29 | select CPU_PJ4B | 29 | select CPU_PJ4B |
30 | 30 | ||
31 | config MACH_ARMADA_370 | 31 | config MACH_ARMADA_370 |
32 | bool "Marvell Armada 370 boards" | 32 | bool "Marvell Armada 370 boards" if ARCH_MULTI_V7 |
33 | select ARMADA_370_CLK | 33 | select ARMADA_370_CLK |
34 | select MACH_ARMADA_370_XP | 34 | select MACH_ARMADA_370_XP |
35 | select PINCTRL_ARMADA_370 | 35 | select PINCTRL_ARMADA_370 |
@@ -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_XP | 40 | config MACH_ARMADA_XP |
41 | bool "Marvell Armada XP boards" | 41 | bool "Marvell Armada XP boards" if ARCH_MULTI_V7 |
42 | select ARMADA_XP_CLK | 42 | select ARMADA_XP_CLK |
43 | select MACH_ARMADA_370_XP | 43 | select MACH_ARMADA_370_XP |
44 | select PINCTRL_ARMADA_XP | 44 | select PINCTRL_ARMADA_XP |