* [PATCH] ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP
@ 2018-06-19 17:20 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2018-06-19 17:20 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: linux-renesas-soc, linux-arm-kernel, Geert Uytterhoeven
As of commit cad160ed0a94927e ("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: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/Makefile | 2 +-
arch/arm/mach-shmobile/headsmp-apmu.S | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 05ba728ed4f67cf2..b33dc59d8698d218 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -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
diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S
index a7b4bc7a087bdca1..fabe9cadd12ef0b1 100644
--- a/arch/arm/mach-shmobile/headsmp-apmu.S
+++ b/arch/arm/mach-shmobile/headsmp-apmu.S
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP
@ 2018-06-19 17:20 ` Geert Uytterhoeven
0 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2018-06-19 17:20 UTC (permalink / raw)
To: linux-arm-kernel
As of commit cad160ed0a94927e ("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: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/Makefile | 2 +-
arch/arm/mach-shmobile/headsmp-apmu.S | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 05ba728ed4f67cf2..b33dc59d8698d218 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -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
diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S
index a7b4bc7a087bdca1..fabe9cadd12ef0b1 100644
--- a/arch/arm/mach-shmobile/headsmp-apmu.S
+++ b/arch/arm/mach-shmobile/headsmp-apmu.S
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP
2018-06-19 17:20 ` Geert Uytterhoeven
@ 2018-06-20 8:56 ` Simon Horman
-1 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2018-06-20 8:56 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Magnus Damm, linux-renesas-soc, linux-arm-kernel
On Tue, Jun 19, 2018 at 07:20:49PM +0200, Geert Uytterhoeven wrote:
> As of commit cad160ed0a94927e ("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: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks Geert,
This looks fine to me but I will wait to see if there are other reviews
before applying.
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP
@ 2018-06-20 8:56 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2018-06-20 8:56 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jun 19, 2018 at 07:20:49PM +0200, Geert Uytterhoeven wrote:
> As of commit cad160ed0a94927e ("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: Geert Uytterhoeven <geert+renesas@glider.be>
Thanks Geert,
This looks fine to me but I will wait to see if there are other reviews
before applying.
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP
2018-06-20 8:56 ` Simon Horman
@ 2018-06-27 15:09 ` Simon Horman
-1 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2018-06-27 15:09 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Magnus Damm, linux-renesas-soc, linux-arm-kernel
On Wed, Jun 20, 2018 at 10:56:19AM +0200, Simon Horman wrote:
> On Tue, Jun 19, 2018 at 07:20:49PM +0200, Geert Uytterhoeven wrote:
> > As of commit cad160ed0a94927e ("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: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Thanks Geert,
>
> This looks fine to me but I will wait to see if there are other reviews
> before applying.
>
> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Thanks, applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP
@ 2018-06-27 15:09 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2018-06-27 15:09 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 20, 2018 at 10:56:19AM +0200, Simon Horman wrote:
> On Tue, Jun 19, 2018 at 07:20:49PM +0200, Geert Uytterhoeven wrote:
> > As of commit cad160ed0a94927e ("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: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Thanks Geert,
>
> This looks fine to me but I will wait to see if there are other reviews
> before applying.
>
> Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Thanks, applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-06-27 15:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-19 17:20 [PATCH] ARM: shmobile: rcar-gen2: Stop compiling headsmp-apmu on !SMP Geert Uytterhoeven
2018-06-19 17:20 ` Geert Uytterhoeven
2018-06-20 8:56 ` Simon Horman
2018-06-20 8:56 ` Simon Horman
2018-06-27 15:09 ` Simon Horman
2018-06-27 15:09 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.