diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-06 10:09:08 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-06 10:09:08 +0200 |
| commit | ff20775d189cf8f36684c88f6f95e00d21bc783c (patch) | |
| tree | e1ef59c548e0be9787fc16b02cb3cecd1635c53f /arch/arm/mach-shmobile/Makefile | |
| parent | 39aa437e18cac7acae55481ed73feea0de497399 (diff) | |
| parent | c99cd90d98a98aa101b169e44d249e5cd71f46f2 (diff) | |
| download | talos-op-linux-ff20775d189cf8f36684c88f6f95e00d21bc783c.tar.gz talos-op-linux-ff20775d189cf8f36684c88f6f95e00d21bc783c.zip | |
Merge tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Renesas ARM Based SoC Marzen Board Removal for v4.3
* Remove legacy r8a7779 SoC code
* Remove legacy marzen board code
* tag 'renesas-marzen-board-removal-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Remove legacy SoC code
ARM: shmobile: marzen: Remove legacy board code
ARM: shmobile: r8a7779: Cleanup header file
ARM: shmobile: marzen-reference: Remove C board code
ARM: shmobile: r8a7779: Generic SMP ops
ARM: shmobile: r8a7779: Generic CCF and timer support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 726c219e5b13..29687a7a0a94 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -21,7 +21,6 @@ obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o ifndef CONFIG_COMMON_CLK obj-y += clock.o obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7778.o -obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o endif # CPU reset vector handling objects @@ -49,13 +48,9 @@ obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o # Board objects -ifdef CONFIG_ARCH_SHMOBILE_MULTI -obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o -else +ifndef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o -obj-$(CONFIG_MACH_MARZEN) += board-marzen.o -endif # Framework support obj-$(CONFIG_SMP) += $(smp-y) |
