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

Commit 23295aee authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP 



As of commit cad160ed ("ARM: shmobile: Convert file to use
cntvoff"), there's no non-SMP code left in headsmp-apmu.S.

Hence build the file for SMP only, and drop the no longer needed check
for CONFIG_SMP inside the file.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent c44e182e

arch/arm/mach-shmobile/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ cpu-y := platsmp.o headsmp.o 
# Shared SoC family objects

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)

CFLAGS_setup-rcar-gen2.o	+= -march=armv7-a

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= headsmp-apmu.o

obj-$(CONFIG_ARCH_R8A7790)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7791)	+= regulator-quirk-rcar-gen2.o

obj-$(CONFIG_ARCH_R8A7793)	+= regulator-quirk-rcar-gen2.o



# SMP objects

smp-y				:= $(cpu-y)

smp-$(CONFIG_ARCH_RCAR_GEN2)	+= headsmp-apmu.o

smp-$(CONFIG_ARCH_SH73A0)	+= smp-sh73a0.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_R8A7779)	+= smp-r8a7779.o headsmp-scu.o platsmp-scu.o

smp-$(CONFIG_ARCH_EMEV2)	+= smp-emev2.o headsmp-scu.o platsmp-scu.o

arch/arm/mach-shmobile/headsmp-apmu.S

+0 −2
Original line number Diff line number Diff line
@@ -8,9 +8,7 @@ 
#include <linux/linkage.h>

#include <asm/assembler.h>



#ifdef CONFIG_SMP

ENTRY(shmobile_boot_apmu)

	bl	secure_cntvoff_init

	b	secondary_startup

ENDPROC(shmobile_boot_apmu)
 
#endif