Skip to contentSkip to conversation

ARCH: mvebu: Makefile clean-up

PATCH New Gregory CLEMENT 2 participants 3 messages Jan 3, 2014 – Feb 5, 2014

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

Gregory CLEMENT

author
#0 lore raw

PATCH 1/1 ARCH: mvebu: Makefile clean-up

Some objects depend on CONFIG_ARCH_MVEBU whereas this whole Makefile depends on the same symbol. Moreover CONFIG_ARCH_MVEBU can't be selected as a module. So we can simplify this Makefile by moving all the object from obj-$(CONFIG_ARCH_MVEBU) to obj-y.

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

---
Jason,

This patch is just a cosmetic one and it will conflict with the patch fix I have just sent, but the conflict is trivial and I can resubmit it as soon as the fix will be part of the 3.13-rc. If it is too late for 3.14, just postpone it for 3.15.

Thanks,

Gregory

 arch/arm/mach-mvebu/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-mvebu/Makefile +1 -2
index 2d04f0e21870..74ca9ae8ab9b 100644
@@ -3,8 +3,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 
 AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a
 
-obj-y				 += system-controller.o
+obj-y				 += coherency.o coherency_ll.o pmsu.o system-controller.o
 obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
-obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
 obj-$(CONFIG_SMP)                += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 1/1 ARCH: mvebu: Makefile clean-up

I sent it too fast, there was a typo in the title:

s/ARCH/ARM/

Sorry :(

Quoted 36 lines · Gregory CLEMENT

Some objects depend on CONFIG_ARCH_MVEBU whereas this whole Makefile depends on the same symbol. Moreover CONFIG_ARCH_MVEBU can't be selected as a module. So we can simplify this Makefile by moving all the object from obj-$(CONFIG_ARCH_MVEBU) to obj-y.

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

---
Jason,

This patch is just a cosmetic one and it will conflict with the patch fix I have just sent, but the conflict is trivial and I can resubmit it as soon as the fix will be part of the 3.13-rc. If it is too late for 3.14, just postpone it for 3.15.

Thanks,

Gregory

 arch/arm/mach-mvebu/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/mach-mvebu/Makefile +1 -2
index 2d04f0e21870..74ca9ae8ab9b 100644
@@ -3,8 +3,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 
 AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a
 
-obj-y				 += system-controller.o
+obj-y				 += coherency.o coherency_ll.o pmsu.o system-controller.o
 obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
-obj-$(CONFIG_ARCH_MVEBU)	 += coherency.o coherency_ll.o pmsu.o
 obj-$(CONFIG_SMP)                += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
Applied
#2 lore raw

PATCH 1/1 ARCH: mvebu: Makefile clean-up

In reply to Gregory CLEMENT
Quoted 14 lines · Gregory CLEMENT

Some objects depend on CONFIG_ARCH_MVEBU whereas this whole Makefile depends on the same symbol. Moreover CONFIG_ARCH_MVEBU can't be selected as a module. So we can simplify this Makefile by moving all the object from obj-$(CONFIG_ARCH_MVEBU) to obj-y.

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

---
Jason,

This patch is just a cosmetic one and it will conflict with the patch fix I have just sent, but the conflict is trivial and I can resubmit it as soon as the fix will be part of the 3.13-rc. If it is too late for 3.14, just postpone it for 3.15.

Quoted 6 lines

Thanks,

Gregory

 arch/arm/mach-mvebu/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Applied to mvebu/soc with s/ARCH/ARM/ and minor conflict resolution for mvebu-soc-id.o.

thx,

Jason.