Skip to contentSkip to conversation

ARM: mvebu: refine which files are build in mach-mvebu

PATCH New Thomas Petazzoni 3 participants 3 messages Apr 28, 2014 1 message not in the archive

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Thomas Petazzoni

author
#1 lore raw

PATCH 1/1 ARM: mvebu: refine which files are build in mach-mvebu

Following the integration into mach-mvebu of the Kirkwood ARMv5 support, we need to be more careful about which files get built. For example, the pmsu.c file now calls wfi(), which only exists on ARMv7 platforms.

Therefore, this commit changes mach-mvebu/Makefile to build the Armada 370/XP/375/38x specific files only when CONFIG_MACH_MVEBU_V7 is enabled.

Signed-off-by Thomas Petazzoni <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>

---
This commit applies on top of mvebu/soc, and has been built tested with mvebu_v7_defconfig, mvebu_v5_defconfig, multi_v7_defconfig and multi_v5_defconfig (on top of mvebu/for-next).

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/mach-mvebu/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
arch/arm/mach-mvebu/Makefile +8 -5
index 02b5389..ec0b217 100644
@@ -3,11 +3,14 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 
 AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a
 
-obj-y				 += system-controller.o mvebu-soc-id.o cpu-reset.o
-obj-$(CONFIG_MACH_MVEBU_V7)      += board-v7.o
+obj-y				 += system-controller.o mvebu-soc-id.o
+
+ifeq ($(CONFIG_MACH_MVEBU_V7),y)
+obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o
+obj-$(CONFIG_SMP)		 += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
+obj-$(CONFIG_HOTPLUG_CPU)	 += hotplug.o
+endif
+
 obj-$(CONFIG_MACH_DOVE)		 += dove.o
-obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
-obj-$(CONFIG_SMP)                += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
-obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
 obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
 obj-$(CONFIG_MACH_T5325)	 += board-t5325.o
Signature · 1 line
1.9.2
maintainer
#2 lore raw

PATCH 1/1 ARM: mvebu: refine which files are build in mach-mvebu

Quoted 11 lines · Thomas Petazzoni

Following the integration into mach-mvebu of the Kirkwood ARMv5 support, we need to be more careful about which files get built. For example, the pmsu.c file now calls wfi(), which only exists on ARMv7 platforms.

Therefore, this commit changes mach-mvebu/Makefile to build the Armada 370/XP/375/38x specific files only when CONFIG_MACH_MVEBU_V7 is enabled.

Signed-off-by Thomas Petazzoni <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>

Hi Thomas

Thanks for this. It looks O.K. to me.

Acked-by Andrew Lunn <[email protected]>

Andrew

Quoted 42 lines

---
This commit applies on top of mvebu/soc, and has been built tested with mvebu_v7_defconfig, mvebu_v5_defconfig, multi_v7_defconfig and multi_v5_defconfig (on top of mvebu/for-next).

Signed-off-by Thomas Petazzoni <[email protected]>
---
 arch/arm/mach-mvebu/Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
arch/arm/mach-mvebu/Makefile +8 -5
index 02b5389..ec0b217 100644
@@ -3,11 +3,14 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 
 AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a
 
-obj-y				 += system-controller.o mvebu-soc-id.o cpu-reset.o
-obj-$(CONFIG_MACH_MVEBU_V7)      += board-v7.o
+obj-y				 += system-controller.o mvebu-soc-id.o
+
+ifeq ($(CONFIG_MACH_MVEBU_V7),y)
+obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o
+obj-$(CONFIG_SMP)		 += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
+obj-$(CONFIG_HOTPLUG_CPU)	 += hotplug.o
+endif
+
 obj-$(CONFIG_MACH_DOVE)		 += dove.o
-obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
-obj-$(CONFIG_SMP)                += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
-obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
 obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
 obj-$(CONFIG_MACH_T5325)	 += board-t5325.o
Signature · 7 lines
1.9.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#3 lore raw

PATCH 1/1 ARM: mvebu: refine which files are build in mach-mvebu

In reply to Thomas Petazzoni
Quoted 9 lines · Thomas Petazzoni

Following the integration into mach-mvebu of the Kirkwood ARMv5 support, we need to be more careful about which files get built. For example, the pmsu.c file now calls wfi(), which only exists on ARMv7 platforms.

Therefore, this commit changes mach-mvebu/Makefile to build the Armada 370/XP/375/38x specific files only when CONFIG_MACH_MVEBU_V7 is enabled.

Quoted 6 lines
Signed-off-by Thomas Petazzoni <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>

---
This commit applies on top of mvebu/soc, and has been built tested with mvebu_v7_defconfig, mvebu_v5_defconfig, multi_v7_defconfig and multi_v5_defconfig (on top of mvebu/for-next).

Awesome! thanks. I've applied it just after

14bde0f0fb54 ARM: mvebu: Add the PMSU related part of the cpu idle functions

which introduced the call to wfi() in pmsu.c.

both patches are in mvebu/soc-cpuidle.

thx,

Jason.