[PATCH 05/13] ARM: spear: merge Kconfig files

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/13] ARM: spear: merge Kconfig files
Date: Fri, 25 Jan 2013 23:35:48 +0000	[thread overview]
Message-ID: <1359156956-32404-6-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1359156956-32404-1-git-send-email-arnd@arndb.de>

As a preparation to merging the spear platforms into one directory, this
merges the four Kconfig files into one.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/mach-spear13xx/Kconfig | 20 ----------------
 arch/arm/mach-spear3xx/Kconfig  | 26 ---------------------
 arch/arm/mach-spear6xx/Kconfig  | 10 --------
 arch/arm/plat-spear/Kconfig     | 51 +++++++++++++++++++++++++++++++++++++----
 4 files changed, 47 insertions(+), 60 deletions(-)
 delete mode 100644 arch/arm/mach-spear13xx/Kconfig
 delete mode 100644 arch/arm/mach-spear3xx/Kconfig
 delete mode 100644 arch/arm/mach-spear6xx/Kconfig

diff --git a/arch/arm/mach-spear13xx/Kconfig b/arch/arm/mach-spear13xx/Kconfig
deleted file mode 100644
index eaadc66..0000000
--- a/arch/arm/mach-spear13xx/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# SPEAr13XX Machine configuration file
-#
-
-if ARCH_SPEAR13XX
-
-menu "SPEAr13xx Implementations"
-config MACH_SPEAR1310
-	bool "SPEAr1310 Machine support with Device Tree"
-	select PINCTRL_SPEAR1310
-	help
-	  Supports ST SPEAr1310 machine configured via the device-tree
-
-config MACH_SPEAR1340
-	bool "SPEAr1340 Machine support with Device Tree"
-	select PINCTRL_SPEAR1340
-	help
-	  Supports ST SPEAr1340 machine configured via the device-tree
-endmenu
-endif #ARCH_SPEAR13XX
diff --git a/arch/arm/mach-spear3xx/Kconfig b/arch/arm/mach-spear3xx/Kconfig
deleted file mode 100644
index 8bd3729..0000000
--- a/arch/arm/mach-spear3xx/Kconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# SPEAr3XX Machine configuration file
-#
-
-if ARCH_SPEAR3XX
-
-menu "SPEAr3xx Implementations"
-config MACH_SPEAR300
-	bool "SPEAr300 Machine support with Device Tree"
-	select PINCTRL_SPEAR300
-	help
-	  Supports ST SPEAr300 machine configured via the device-tree
-
-config MACH_SPEAR310
-	bool "SPEAr310 Machine support with Device Tree"
-	select PINCTRL_SPEAR310
-	help
-	  Supports ST SPEAr310 machine configured via the device-tree
-
-config MACH_SPEAR320
-	bool "SPEAr320 Machine support with Device Tree"
-	select PINCTRL_SPEAR320
-	help
-	  Supports ST SPEAr320 machine configured via the device-tree
-endmenu
-endif #ARCH_SPEAR3XX
diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig
deleted file mode 100644
index 339f397..0000000
--- a/arch/arm/mach-spear6xx/Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# SPEAr6XX Machine configuration file
-#
-
-config MACH_SPEAR600
-	def_bool y
-	depends on ARCH_SPEAR6XX
-	select USE_OF
-	help
-	  Supports ST SPEAr600 boards configured via the device-tree
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig
index 87dbd81..60987a3 100644
--- a/arch/arm/plat-spear/Kconfig
+++ b/arch/arm/plat-spear/Kconfig
@@ -38,9 +38,52 @@ config ARCH_SPEAR6XX
 
 endchoice
 
-# Adding SPEAr machine specific configuration files
-source "arch/arm/mach-spear13xx/Kconfig"
-source "arch/arm/mach-spear3xx/Kconfig"
-source "arch/arm/mach-spear6xx/Kconfig"
+if ARCH_SPEAR13XX
+
+menu "SPEAr13xx Implementations"
+config MACH_SPEAR1310
+	bool "SPEAr1310 Machine support with Device Tree"
+	select PINCTRL_SPEAR1310
+	help
+	  Supports ST SPEAr1310 machine configured via the device-tree
+
+config MACH_SPEAR1340
+	bool "SPEAr1340 Machine support with Device Tree"
+	select PINCTRL_SPEAR1340
+	help
+	  Supports ST SPEAr1340 machine configured via the device-tree
+endmenu
+endif #ARCH_SPEAR13XX
+
+if ARCH_SPEAR3XX
+
+menu "SPEAr3xx Implementations"
+config MACH_SPEAR300
+	bool "SPEAr300 Machine support with Device Tree"
+	select PINCTRL_SPEAR300
+	help
+	  Supports ST SPEAr300 machine configured via the device-tree
+
+config MACH_SPEAR310
+	bool "SPEAr310 Machine support with Device Tree"
+	select PINCTRL_SPEAR310
+	help
+	  Supports ST SPEAr310 machine configured via the device-tree
+
+config MACH_SPEAR320
+	bool "SPEAr320 Machine support with Device Tree"
+	select PINCTRL_SPEAR320
+	help
+	  Supports ST SPEAr320 machine configured via the device-tree
+endmenu
+
+endif
+
+config MACH_SPEAR600
+	def_bool y
+	depends on ARCH_SPEAR6XX
+	select USE_OF
+	help
+	  Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig"
 
 endif
-- 
1.8.0

next prev parent reply	other threads:[~2013-01-25 23:35 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-25 23:35 [PATCH 00/13] ARM: spear multiplatform support Arnd Bergmann
2013-01-25 23:35 ` [PATCH 01/13] ARM: spear13xx: make mach/dma.h local Arnd Bergmann
2013-01-25 23:35 ` [PATCH 02/13] ARM: spear: unify mach/generic.h and mach/irqs.h Arnd Bergmann
2013-01-25 23:35 ` [PATCH 03/13] ARM: spear: move identical headers to plat-spear/include/mach Arnd Bergmann
2013-01-25 23:35 ` [PATCH 04/13] ARM: spear: make spear3xx/6xx mach/spear.h files identical Arnd Bergmann
2013-01-25 23:35 ` Arnd Bergmann [this message]
2013-01-25 23:35 ` [PATCH 06/13] ARM: spear: move spear.h and misc_regs.h into plat-spear Arnd Bergmann
2013-01-25 23:35 ` [PATCH 07/13] ARM: spear: move all files to mach-spear Arnd Bergmann
2013-01-25 23:35 ` [PATCH 08/13] ARM: spear: move generic.h and pl080.h into private dir Arnd Bergmann
2013-01-25 23:35 ` [PATCH 09/13] ARM: spear: make clock driver independent of headers Arnd Bergmann
2013-01-26 17:54   ` Mike Turquette
2013-01-25 23:35 ` [PATCH 10/13] ARM: spear: rename duplicate pl080_plat_data Arnd Bergmann
2013-01-25 23:35 ` [PATCH 11/13] ARM: spear: use multiplatform configuration options Arnd Bergmann
2013-01-25 23:35 ` [PATCH 12/13] ARM: spear: adapt defconfig files for multiplatform Arnd Bergmann
2013-01-25 23:35 ` [PATCH 13/13] ARM: spear: fix build error in restart.c Arnd Bergmann
2013-01-25 23:37 ` [PATCH 00/13] ARM: spear multiplatform support Arnd Bergmann
2013-01-26  6:01 ` Viresh Kumar
2013-01-28 11:22 ` vipul kumar samar
2013-01-28 13:37   ` Arnd Bergmann

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:eaadc66 dfblob:8bd3729 dfblob:339f397 dfblob:87dbd81
dfblob:60987a3 )
 OR (
bs:"[PATCH 05/13] ARM: spear: merge Kconfig files" )
	(help)

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=1359156956-32404-6-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --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).