Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6bd0579 authored by Marc Gonzalez's avatar Marc Gonzalez Committed by Olof Johansson
Browse files

ARM: tango: Fix UP build issues 



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

Signed-off-by: default avatarMarc Gonzalez <marc_gonzalez@sigmadesigns.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 765ff22d

arch/arm/mach-tango/Makefile

+3 −1
Original line number Diff line number Diff line 
plus_sec := $(call as-instr,.arch_extension sec,+sec)

AFLAGS_smc.o := -Wa,-march=armv7-a$(plus_sec)



obj-y += setup.o smc.o

obj-$(CONFIG_SMP) += platsmp.o

arch/arm/mach-tango/platsmp.c

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#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);

arch/arm/mach-tango/setup.c

+0 −14
Original line number Diff line number Diff line 
#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)