From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: mvebu: Armada 375/38x depend on MULTI_V7
Date: Mon, 24 Feb 2014 13:31:15 +0100 [thread overview]
Message-ID: <20140224123115.GC18601@lunn.ch> (raw)
In-Reply-To: <1393174030-10549-1-git-send-email-jason@lakedaemon.net>
On Sun, Feb 23, 2014 at 04:47:10PM +0000, Jason Cooper wrote:
> 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.
>
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Thanks Jason,
Andrew
> ---
> Adding this to mvebu/soc-3xx
>
> 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 884b275ab056..00dc4a6ace6e 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -38,7 +38,7 @@ config MACH_ARMADA_370
> on the Marvell Armada 370 SoC with device tree.
>
> config MACH_ARMADA_375
> - bool "Marvell Armada 375 boards"
> + bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
> select ARM_ERRATA_720789
> select ARM_ERRATA_753970
> select ARM_GIC
> @@ -52,7 +52,7 @@ config MACH_ARMADA_375
> on the Marvell Armada 375 SoC with device tree.
>
> config MACH_ARMADA_38X
> - bool "Marvell Armada 380/385 boards"
> + bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
> select ARM_ERRATA_720789
> select ARM_ERRATA_753970
> select ARM_GIC
> --
> 1.9.0
>
next prev parent reply other threads:[~2014-02-24 12:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-23 16:47 [PATCH] ARM: mvebu: Armada 375/38x depend on MULTI_V7 Jason Cooper
2014-02-24 12:31 ` Andrew Lunn [this message]
2014-02-24 17:35 ` Jason Cooper
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=20140224123115.GC18601@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.