All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/3] ARM: realview: use Kconfig choice for debug UART selection
Date: Tue, 16 Aug 2011 22:41:13 +0100	[thread overview]
Message-ID: <1313530873-24961-3-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1313530873-24961-1-git-send-email-will.deacon@arm.com>

Now that the DEBUG_LL UART can be selected by a Kconfig choice, simplify
the #ifdefery in debug-macro.S and add entries to the top-level
Kconfig.debug instead.

Cc: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm/Kconfig.debug                            |   16 ++++++++++++++++
 arch/arm/mach-realview/include/mach/debug-macro.S |   17 ++---------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 2f80564..f23975a 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -127,6 +127,22 @@ choice
 		  The uncompressor code port configuration is now handled
 		  by CONFIG_S3C_LOWLEVEL_UART_PORT.
 
+	config DEBUG_REALVIEW_STD_PORT
+		bool "RealView Default UART"
+		depends on ARCH_REALVIEW
+		help
+		  Say Y here if you want the debug print routines to direct
+		  their output to the serial port on RealView EB, PB11MP, PBA8
+		  and PBX platforms.
+
+	config DEBUG_REALVIEW_PB1176_PORT
+		bool "RealView PB1176 UART"
+		depends on MACH_REALVIEW_PB1176
+		help
+		  Say Y here if you want the debug print routines to direct
+		  their output to the standard serial port on the RealView
+		  PB1176 platform.
+
 endchoice
 
 config EARLY_PRINTK
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
index 90b687c..0f38722 100644
--- a/arch/arm/mach-realview/include/mach/debug-macro.S
+++ b/arch/arm/mach-realview/include/mach/debug-macro.S
@@ -10,23 +10,10 @@
  * published by the Free Software Foundation.
  */
 
-#if defined(CONFIG_MACH_REALVIEW_EB) || \
-    defined(CONFIG_MACH_REALVIEW_PB11MP) || \
-    defined(CONFIG_MACH_REALVIEW_PBA8) || \
-    defined(CONFIG_MACH_REALVIEW_PBX)
-#ifndef DEBUG_LL_UART_OFFSET
+#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT
 #define DEBUG_LL_UART_OFFSET	0x00009000
-#elif DEBUG_LL_UART_OFFSET != 0x00009000
-#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
-#endif
-#endif
-
-#ifdef CONFIG_MACH_REALVIEW_PB1176
-#ifndef DEBUG_LL_UART_OFFSET
+#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)
 #define DEBUG_LL_UART_OFFSET	0x0010c000
-#elif DEBUG_LL_UART_OFFSET != 0x0010c000
-#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
-#endif
 #endif
 
 #ifndef DEBUG_LL_UART_OFFSET
-- 
1.7.0.4

  parent reply	other threads:[~2011-08-16 21:41 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-16 21:41 [PATCH 1/3] ARM: debug: use kconfig choice for selecting DEBUG_LL UART Will Deacon
2011-08-16 21:41 ` [PATCH 2/3] ARM: plat-samsung: use Kconfig choice for debug UART selection Will Deacon
2011-10-10 11:56   ` Thomas Abraham
2011-10-10 11:56     ` Thomas Abraham
2011-10-10 12:23     ` Will Deacon
2011-10-10 12:23       ` Will Deacon
2011-10-10 12:35       ` Thomas Abraham
2011-10-10 12:35         ` Thomas Abraham
2011-10-10 13:34         ` Will Deacon
2011-10-10 13:34           ` Will Deacon
2011-10-10 13:38           ` Thomas Abraham
2011-10-10 13:38             ` Thomas Abraham
2011-08-16 21:41 ` Will Deacon [this message]
2011-08-18  4:06 ` [PATCH 1/3] ARM: debug: use kconfig choice for selecting DEBUG_LL UART Nicolas Pitre
2011-08-18  9:33   ` Will Deacon
2011-08-18 16:11 ` Shawn Guo
2011-08-18 16:07   ` Will Deacon
2011-08-19  4:59     ` Shawn Guo
2011-08-19 11:08       ` Will Deacon
2011-08-19 11:37         ` Shawn Guo
2011-08-19 12:32           ` Will Deacon
2011-08-19 15:49             ` Nicolas Pitre
2011-08-21  9:14               ` Russell King - ARM Linux
2011-08-21 17:35                 ` Nicolas Pitre
2011-08-21 18:26                   ` Russell King - ARM Linux
2011-08-21 19:02                     ` Nicolas Pitre
2011-08-21 19:18                       ` Russell King - ARM Linux
2011-08-21 19:22                         ` Russell King - ARM Linux
2011-08-21 20:07                           ` Nicolas Pitre
2011-08-21 20:54                             ` Russell King - ARM Linux
2011-08-21 21:00                               ` Nicolas Pitre
2011-08-21 21:29                                 ` Russell King - ARM Linux
2011-08-21 22:00                                   ` Nicolas Pitre
2011-08-21 19:53                         ` Nicolas Pitre
2011-09-06  9:28                           ` Tony Lindgren
2011-09-06  9:37                             ` Russell King - ARM Linux
2011-09-06 10:27                               ` Tony Lindgren
2011-09-06 10:52                                 ` Russell King - ARM Linux
2011-09-06 11:01                                   ` Tony Lindgren
2011-09-06 11:07                                     ` Russell King - ARM Linux
2011-09-06 19:45                                       ` Uwe Kleine-König
2011-08-19 14:54           ` Nicolas Pitre
2011-08-19  4:56 ` [PATCH] arm/imx: use Kconfig choice for low-level debug UART selection Shawn Guo
2011-08-19  6:35   ` Sascha Hauer
2011-08-19  7:00     ` Shawn Guo
2011-08-19 11:09     ` Will Deacon
2011-08-19 11:39       ` Sascha Hauer
2011-08-19 12:35         ` Will Deacon
2011-08-19 17:15           ` Sascha Hauer
2011-08-21  9:18         ` Russell King - ARM Linux
2011-08-21 11:25           ` Will Deacon
2011-08-21 17:59           ` Nicolas Pitre
2011-08-21 18:17             ` Russell King - ARM Linux
2011-08-21 18:28               ` Nicolas Pitre
2011-08-21 18:33                 ` Russell King - ARM Linux
2011-11-22  8:58   ` Uwe Kleine-König
2011-11-22 11:50     ` Will Deacon
2011-11-22 13:02       ` Uwe Kleine-König
2011-11-22 13:20         ` Will Deacon
2011-11-22 13:30           ` Uwe Kleine-König
2011-11-22 15:48             ` Russell King - ARM Linux
2011-11-22 16:38               ` Uwe Kleine-König
2011-11-22 16:47                 ` Mark Brown
2011-11-22 17:13                   ` Uwe Kleine-König
2011-11-22 20:24                   ` Russell King - ARM Linux
2011-11-22 21:19                     ` Arnd Bergmann
2011-11-22 23:00                       ` Mark Brown
2011-11-23 10:57                         ` Will Deacon
2011-09-15 17:34 ` [PATCH 1/3] ARM: debug: use kconfig choice for selecting DEBUG_LL UART Stephen Boyd
2011-09-16 11:41   ` Will Deacon
2011-09-19 18:01     ` [PATCH 1/2] ARM: debug: Add CLSP711X_UART1 config choice Stephen Boyd
2011-09-19 18:01       ` Stephen Boyd
2011-09-19 18:01       ` [PATCH 2/2] ARM: debug: Move DEBUG_ICEDCC into the DEBUG_LL choice Stephen Boyd
2011-09-19 18:01         ` Stephen Boyd
2011-09-19 21:25       ` [PATCH 1/2] ARM: debug: Add CLSP711X_UART1 config choice Will Deacon
2011-09-19 21:25         ` Will Deacon
2011-09-19 22:12         ` Stephen Boyd
2011-09-19 22:12           ` Stephen Boyd
2011-09-19 22:41           ` Russell King - ARM Linux
2011-09-19 22:41             ` Russell King - ARM Linux
2011-09-19 22:55             ` Stephen Boyd
2011-09-19 22:55               ` Stephen Boyd
2011-11-22 20:42               ` Russell King - ARM Linux
2011-11-22 20:42                 ` Russell King - ARM Linux
2011-09-19 23:14           ` Will Deacon
2011-09-19 23:14             ` Will Deacon

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=1313530873-24961-3-git-send-email-will.deacon@arm.com \
    --to=will.deacon@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.