diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-12 09:44:52 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-12 09:44:52 -0700 |
| commit | e87d10b29f459e23964b14fe2300f808c5b6282e (patch) | |
| tree | 50f3f9dc4edf56c04057bc22942dc906ee7a381a /arch/arm/mach-shmobile/Makefile | |
| parent | e1ddcdef841f68d175b1a4a5c91d55f383ce5241 (diff) | |
| parent | bfe4cfa8ae21628267f2b879b4396ee17ea4fd3a (diff) | |
| download | linux-e87d10b29f459e23964b14fe2300f808c5b6282e.tar.bz2 | |
Merge tag 'renesas-soc2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Second Round of Renesas ARM Based SoC Updates for v3.17" from Simon
Horman:
* Suspend on non-SMP update for r8a7790
* Move r8a7791.h out of mach directory.
This is part of a multi-stage effort to move headers
out of that directory.
* tag 'renesas-soc2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Allow r8a7791 to build non-SMP APMU code
ARM: shmobile: Move r8a7791 reset code to pm-r8a7791.c
ARM: shmobile: Allow r8a7790 to build non-SMP APMU code
ARM: shmobile: Move r8a7790 reset code to pm-r8a7790.c
ARM: shmobile: Use __init for APMU suspend init function
ARM: shmobile: Adjust APMU code to build for non-SMP
ARM: shmobile: Allow use of boot code for non-SMP case
ARM: shmobile: Move r8a7791.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index ccb056327fd4..fe3878a1a69a 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -34,17 +34,19 @@ obj-$(CONFIG_ARCH_R8A7791) += clock-r8a7791.o obj-$(CONFIG_ARCH_R7S72100) += clock-r7s72100.o endif +# CPU reset vector handling objects +cpu-y := platsmp.o headsmp.o +cpu-$(CONFIG_ARCH_R8A7790) += platsmp-apmu.o +cpu-$(CONFIG_ARCH_R8A7791) += platsmp-apmu.o + # SMP objects -smp-y := platsmp.o headsmp.o +smp-y := $(cpu-y) 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_R8A7790) += smp-r8a7790.o platsmp-apmu.o -smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o platsmp-apmu.o +smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o +smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o -# IRQ objects -obj-$(CONFIG_ARCH_SH7372) += entry-intc.o - # PM objects obj-$(CONFIG_SUSPEND) += suspend.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o @@ -53,8 +55,11 @@ obj-$(CONFIG_ARCH_SH7372) += pm-sh7372.o sleep-sh7372.o pm-rmobile.o obj-$(CONFIG_ARCH_SH73A0) += pm-sh73a0.o obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o pm-rcar.o -obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o -obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o +obj-$(CONFIG_ARCH_R8A7790) += pm-r8a7790.o pm-rcar.o $(cpu-y) +obj-$(CONFIG_ARCH_R8A7791) += pm-r8a7791.o pm-rcar.o $(cpu-y) + +# IRQ objects +obj-$(CONFIG_ARCH_SH7372) += entry-intc.o # Board objects ifdef CONFIG_ARCH_SHMOBILE_MULTI |