| From 2bb71b0d7e9a7b809391a785318bbc1f6c6b5ab7 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Tue, 1 Oct 2013 19:33:15 +0900 |
| Subject: 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> |
| (cherry picked from commit 3ae970a688f8f8a74d1b489b8646733a830c904b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 10 ++-------- |
| arch/arm/mach-shmobile/Makefile | 4 ++++ |
| 2 files changed, 6 insertions(+), 8 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 6a684ff62124..c9c4f15483bd 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -22,16 +22,10 @@ config ARCH_EMEV2 |
| |
| comment "SH-Mobile Board Type" |
| |
| -config MACH_KZM9D_REFERENCE |
| - bool "KZM9D board - Reference Device Tree Implementation" |
| +config MACH_KZM9D |
| + bool "KZM9D board" |
| depends on ARCH_EMEV2 |
| select REGULATOR_FIXED_VOLTAGE if REGULATOR |
| - ---help--- |
| - Use reference implementation of KZM9D board support |
| - which makes a greater use of device tree at the expense |
| - of not supporting a number of devices. |
| - |
| - This is intended to aid developers |
| |
| comment "SH-Mobile System Configuration" |
| endif |
| 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) |
| -- |
| 1.8.5.rc3 |
| |
