summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/Makefile
diff options
context:
space:
mode:
authorMagnus Damm2013-10-01 12:33:15 +0200
committerSimon Horman2013-10-08 03:02:21 +0200
commit3ae970a688f8f8a74d1b489b8646733a830c904b (patch)
tree70292a7bbfad1fdb15866b8de623577d7a43a1e3 /arch/arm/mach-shmobile/Makefile
parentARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS (diff)
downloadkernel-qcow2-linux-3ae970a688f8f8a74d1b489b8646733a830c904b.tar.gz
kernel-qcow2-linux-3ae970a688f8f8a74d1b489b8646733a830c904b.tar.xz
kernel-qcow2-linux-3ae970a688f8f8a74d1b489b8646733a830c904b.zip
ARM: shmobile: Use KZM9D without reference for multiplatform
Change the multiplatform kconfig bits for KZM9D from CONFIG_MACH_KZM9D_REFERENCE into CONFIG_MACH_KZM9D to match the non-multiplatform case. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
-rw-r--r--arch/arm/mach-shmobile/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index b3840ba1a445..b11466d4d944 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -55,6 +55,9 @@ obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o
obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o
# Board objects
+ifdef CONFIG_ARCH_SHMOBILE_MULTI
+obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o
+else
obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o
obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
@@ -72,6 +75,7 @@ obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o
obj-$(CONFIG_MACH_KZM9D_REFERENCE) += board-kzm9d-reference.o
obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o
obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o
+endif
# Framework support
obj-$(CONFIG_SMP) += $(smp-y)