Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ae970a6 authored Oct 01, 2013 by Magnus Damm Committed by Simon Horman Oct 08, 2013

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>

parent 9e8b48b6

arch/arm/mach-shmobile/Kconfig

+2 −8

Original line number	Original line	Diff line number	Diff line
	@@ -22,16 +22,10 @@ config ARCH_EMEV2

	comment "SH-Mobile Board Type"		comment "SH-Mobile Board Type"

	config MACH_KZM9D_REFERENCE		config MACH_KZM9D
	bool "KZM9D board - Reference Device Tree Implementation"		bool "KZM9D board"
	depends on ARCH_EMEV2		depends on ARCH_EMEV2
	select REGULATOR_FIXED_VOLTAGE if REGULATOR		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"		comment "SH-Mobile System Configuration"
	endif		endif

arch/arm/mach-shmobile/Makefile

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -55,6 +55,9 @@ obj-$(CONFIG_ARCH_R8A7740) += pm-r8a7740.o pm-rmobile.o
	obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o		obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o

	# Board objects		# 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) += board-ape6evm.o
	obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o		obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
	obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.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_KZM9D_REFERENCE) += board-kzm9d-reference.o
	obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o		obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o
	obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o		obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o
			endif

	# Framework support		# Framework support
	obj-$(CONFIG_SMP) += $(smp-y)		obj-$(CONFIG_SMP) += $(smp-y)