linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Magnus Damm <magnus.damm@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
Date: Tue, 01 Oct 2013 10:33:15 +0000	[thread overview]
Message-ID: <20131001103315.813.80581.sendpatchset@w520> (raw)
In-Reply-To: <20131001103255.813.65710.sendpatchset@w520>

From: Magnus Damm <damm@opensource.se>

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>
---

 arch/arm/mach-shmobile/Kconfig  |   10 ++--------
 arch/arm/mach-shmobile/Makefile |    4 ++++
 2 files changed, 6 insertions(+), 8 deletions(-)

--- 0001/arch/arm/mach-shmobile/Kconfig
+++ work/arch/arm/mach-shmobile/Kconfig	2013-09-27 11:22:20.000000000 +0900
@@ -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
--- 0001/arch/arm/mach-shmobile/Makefile
+++ work/arch/arm/mach-shmobile/Makefile	2013-09-27 11:23:32.000000000 +0900
@@ -52,6 +52,9 @@ obj-$(CONFIG_ARCH_R8A7740)	+= pm-r8a7740
 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
@@ -68,6 +71,7 @@ obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d.
 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)

  parent reply	other threads:[~2013-10-01 10:33 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-01 10:32 [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Magnus Damm
2013-10-01 10:33 ` [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS Magnus Damm
2013-10-03  3:49   ` Simon Horman
2013-10-03  9:56     ` Laurent Pinchart
2013-10-03 23:57       ` Simon Horman
2013-10-01 10:33 ` Magnus Damm [this message]
2013-10-03  4:22   ` [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform Simon Horman
2013-10-01 10:33 ` [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference support Magnus Damm
2013-10-03  4:24   ` Simon Horman
2013-10-01 10:33 ` [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB Magnus Damm
2013-10-03  4:25   ` Simon Horman
2013-10-01 10:33 ` [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS Magnus Damm
2013-10-03  4:26   ` Simon Horman
2013-10-04  7:47 ` [PATCH 00/05] ARM: shmobile: KZM9D Multiplatform update Laurent Pinchart
2013-10-04  8:25   ` Simon Horman
2013-10-04  8:55     ` Magnus Damm
2013-10-08  1:25       ` Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131001103315.813.80581.sendpatchset@w520 \
    --to=magnus.damm@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).