ARM: tango: Fix UP build issues

Move SMP setup to platsmp.c for consistency with other platforms.

Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-tango/Makefile b/arch/arm/mach-tango/Makefile
index 99422ea..f33935e 100644 (file)
--- a/arch/arm/mach-tango/Makefile
+++ b/arch/arm/mach-tango/Makefile
@@ -1,3 +1,5 @@
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
-AFLAGS_smc.o           :=-Wa,-march=armv7-a$(plus_sec)
+AFLAGS_smc.o := -Wa,-march=armv7-a$(plus_sec)
+
 obj-y += setup.o smc.o
+obj-$(CONFIG_SMP) += platsmp.o

diff --git a/arch/arm/mach-tango/platsmp.c b/arch/arm/mach-tango/platsmp.c
new file mode 100644 (file)
index 0000000..a18d5a3
--- /dev/null
+++ b/arch/arm/mach-tango/platsmp.c
@@ -0,0 +1,16 @@
+#include <linux/init.h>
+#include <linux/smp.h>
+#include "smc.h"
+
+static int tango_boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+       tango_set_aux_boot_addr(virt_to_phys(secondary_startup));
+       tango_start_aux_core(cpu);
+       return 0;
+}
+
+static struct smp_operations tango_smp_ops __initdata = {
+       .smp_boot_secondary     = tango_boot_secondary,
+};
+
+CPU_METHOD_OF_DECLARE(tango4_smp, "sigma,tango4-smp", &tango_smp_ops);

diff --git a/arch/arm/mach-tango/setup.c b/arch/arm/mach-tango/setup.c
index d869005..f14b6c7 100644 (file)
--- a/arch/arm/mach-tango/setup.c
+++ b/arch/arm/mach-tango/setup.c
@@ -1,21 +1,7 @@
-#include <linux/smp.h>
 #include <asm/mach/arch.h>
 #include <asm/hardware/cache-l2x0.h>
 #include "smc.h"
 
-static int tango4_boot_secondary(unsigned int cpu, struct task_struct *idle)
-{
-       tango_set_aux_boot_addr(virt_to_phys(secondary_startup));
-       tango_start_aux_core(cpu);
-       return 0;
-}
-
-static struct smp_operations tango4_smp_ops __initdata = {
-       .smp_boot_secondary     = tango4_boot_secondary,
-};
-
-CPU_METHOD_OF_DECLARE(tango4_smp, "sigma,tango4-smp", &tango4_smp_ops);
-
 static void tango_l2c_write(unsigned long val, unsigned int reg)
 {
        if (reg == L2X0_CTRL)