Skip to contentSkip to conversation

ARM: mvebu: Armada 375/38x depend on MULTI_V7

PATCH New Jason Cooper 2 participants 3 messages Feb 23, 2014 – Feb 24, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
Adding this to mvebu/soc-3xx

 arch/arm/mach-mvebu/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mvebu/Kconfig +2 -2
index 884b275ab056..00dc4a6ace6e 100644
@@ -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
Signature · 1 line
1.9.0
maintainer
#1 lore raw

PATCH 1/1 ARM: mvebu: Armada 375/38x depend on MULTI_V7

Quoted 9 lines · Jason Cooper

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.

Thanks Jason,

Andrew

Quoted 31 lines

---
Adding this to mvebu/soc-3xx

 arch/arm/mach-mvebu/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mvebu/Kconfig +2 -2
index 884b275ab056..00dc4a6ace6e 100644
@@ -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
Signature · 1 line
1.9.0
#2 lore raw

PATCH 1/1 ARM: mvebu: Armada 375/38x depend on MULTI_V7

Quoted 6 lines · Andrew Lunn
Quoted 5 lines · Jason Cooper

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.

Quoted 6 lines
Quoted 4 lines

We add this dependency to the new SoCs so that when the branches are merged, everything is as it should be.

Added and pushed.

thx,

Jason.