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

Commit facadba6 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx6: build headsmp.o only on CONFIG_SMP 



With v7_cpu_resume() being moved out of headsmp.S, all the remaining
code in the file is only needed by CONFIG_SMP build.  So we can control
the build of headsmp.o with only obj-$(CONFIG_SMP) now.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent c356bdb4

arch/arm/mach-imx/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -104,9 +104,9 @@ obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o mach-imx6sl.o 




AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a

AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a

obj-$(CONFIG_SUSPEND) += suspend-imx6.o

obj-$(CONFIG_SUSPEND) += suspend-imx6.o

obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o headsmp.o

obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o

# i.MX6SL reuses i.MX6Q code

# i.MX6SL reuses i.MX6Q code

obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o headsmp.o

obj-$(CONFIG_SOC_IMX6SL) += pm-imx6q.o





# i.MX5 based machines

# i.MX5 based machines

obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o

obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o

arch/arm/mach-imx/headsmp.S

+0 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 




	.section ".text.head", "ax"

	.section ".text.head", "ax"





#ifdef CONFIG_SMP

diag_reg_offset:

diag_reg_offset:

	.word	g_diag_reg - .

	.word	g_diag_reg - .
@@ -32,4 +31,3 @@ ENTRY(v7_secondary_startup) 
	set_diag_reg

	set_diag_reg

	b	secondary_startup

	b	secondary_startup

ENDPROC(v7_secondary_startup)
 
ENDPROC(v7_secondary_startup)
 
#endif