Skip to content

Commit

Permalink
ARM: tango: Fix UP build issues
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marc Gonzalez authored and Olof Johansson committed Jan 7, 2016
1 parent 765ff22 commit d6bd057
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
4 changes: 3 additions & 1 deletion arch/arm/mach-tango/Makefile
Original file line number Diff line number Diff line change
@@ -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
16 changes: 16 additions & 0 deletions arch/arm/mach-tango/platsmp.c
Original file line number Diff line number Diff line change
@@ -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);
14 changes: 0 additions & 14 deletions arch/arm/mach-tango/setup.c
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit d6bd057

Please sign in to comment.