* [PATCH] ARM: mvebu: Armada 375/38x depend on MULTI_V7
@ 2014-02-23 16:47 Jason Cooper
2014-02-24 12:31 ` Andrew Lunn
0 siblings, 1 reply; 3+ messages in thread
From: Jason Cooper @ 2014-02-23 16:47 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] ARM: mvebu: Armada 375/38x depend on MULTI_V7
2014-02-23 16:47 [PATCH] ARM: mvebu: Armada 375/38x depend on MULTI_V7 Jason Cooper
@ 2014-02-24 12:31 ` Andrew Lunn
2014-02-24 17:35 ` Jason Cooper
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Lunn @ 2014-02-24 12:31 UTC (permalink / raw)
To: linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] ARM: mvebu: Armada 375/38x depend on MULTI_V7
2014-02-24 12:31 ` Andrew Lunn
@ 2014-02-24 17:35 ` Jason Cooper
0 siblings, 0 replies; 3+ messages in thread
From: Jason Cooper @ 2014-02-24 17:35 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Feb 24, 2014 at 01:31:15PM +0100, Andrew Lunn wrote:
> 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>
Added and pushed.
thx,
Jason.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-24 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-23 16:47 [PATCH] ARM: mvebu: Armada 375/38x depend on MULTI_V7 Jason Cooper
2014-02-24 12:31 ` Andrew Lunn
2014-02-24 17:35 ` Jason Cooper
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).