linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 08/22] ARM: MVEBU: Add ARCH_MULTI_V7 to SoCs
Date: Sat, 22 Feb 2014 20:14:50 +0100	[thread overview]
Message-ID: <1393096504-11844-9-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1393096504-11844-1-git-send-email-andrew@lunn.ch>

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>
---
 arch/arm/mach-mvebu/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 5e269d7263ce..9ab22e1b26cd 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -29,7 +29,7 @@ config MACH_ARMADA_370_XP
 	select CPU_PJ4B
 
 config MACH_ARMADA_370
-	bool "Marvell Armada 370 boards"
+	bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
 	select ARMADA_370_CLK
 	select MACH_ARMADA_370_XP
 	select PINCTRL_ARMADA_370
@@ -38,7 +38,7 @@ config MACH_ARMADA_370
 	  on the Marvell Armada 370 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 MACH_ARMADA_370_XP
 	select PINCTRL_ARMADA_XP
-- 
1.8.5.3

  parent reply	other threads:[~2014-02-22 19:14 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-22 19:14 [PATCH v4 00/22] Move DT kirkwood into mach-mvebu Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 01/22] ARM: Kirkwood: Give pm.c its own header file Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 02/22] irqchip: Orion: Fix getting generic chip pointer Andrew Lunn
2014-02-22 19:46   ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 03/22] ARM: Kirkwood: Convert mv88f6281gtw_ge switch setup to DT Andrew Lunn
2014-02-22 19:50   ` Jason Cooper
2014-02-22 20:20     ` Andrew Lunn
2014-02-22 20:23       ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 04/22] ARM: Kirkwood: Drop printing the SoC type and revision Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 05/22] ARM: Kirkwood: Seperate board-dt from common and pcie code Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 06/22] ARM: Kirkwood: ioremap the cpu_config register before using it Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 07/22] ARM: Kirkwood: ioremap memory control register Andrew Lunn
2014-02-22 19:14 ` Andrew Lunn [this message]
2014-02-22 19:14 ` [PATCH v4 09/22] ARM: Orion: Move cache-feroceon-l2.h out of plat-orion Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 10/22] ARM: MM: Add DT binding for Feroceon L2 cache Andrew Lunn
2014-02-22 20:11   ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 11/22] ARM: Kirkwood: Instantiate L2 cache from DT Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 12/22] ARM: Fix default CPU selection for ARCH_MULTI_V5 Andrew Lunn
2014-02-22 19:58   ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 13/22] ARM: Fix MULTI_TLB for feroceon Andrew Lunn
2014-02-22 20:03   ` Jason Cooper
2014-02-22 19:14 ` [PATCH v4 14/22] ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 15/22] ARM: Move kirkwood DT boards into mach-mvebu Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 16/22] ARM: MVEBU: Let kirkwood use the system controller for restart Andrew Lunn
2014-02-22 19:14 ` [PATCH v4 17/22] ARM: MVEBU: Instantiate system controller in kirkwood.dtsi Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 18/22] drivers: Enable building of Kirkwood drivers for mach-mvebu Andrew Lunn
2014-02-24  5:37   ` Viresh Kumar
2014-02-24 17:32     ` Jason Cooper
2014-03-27 17:35   ` Bryan Wu
2014-02-22 19:15 ` [PATCH v4 19/22] ARM: MVEBU: Enable mvebu-soc-id on Kirkwood Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 20/22] ARM: config: Add a multi_v5_defconfig Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 21/22] ARM: MVEBU: Simplifiy headers and make local Andrew Lunn
2014-02-22 19:15 ` [PATCH v4 22/22] ARM: config: Add mvebu_v5_defconfig Andrew Lunn
2014-02-22 22:16 ` [PATCH v4 00/22] Move DT kirkwood into mach-mvebu Jason Cooper
2014-02-23 11:14   ` Andrew Lunn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393096504-11844-9-git-send-email-andrew@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).