5 files changed, 122 insertions, 69 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 0887801c324f..13c0631e6e95 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -128,6 +128,111 @@ choice
                  Say Y here if you want the debug print routines to direct
                  their output to the second serial port on these devices.
+        config DEBUG_IMX1_UART
+                bool "i.MX1 Debug UART"
+                depends on SOC_IMX1
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX1.
+        config DEBUG_IMX23_UART
+                bool "i.MX23 Debug UART"
+                depends on SOC_IMX23
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX23.
+        config DEBUG_IMX25_UART
+                bool "i.MX25 Debug UART"
+                depends on SOC_IMX25
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX25.
+        config DEBUG_IMX21_IMX27_UART
+                bool "i.MX21 and i.MX27 Debug UART"
+                depends on SOC_IMX21 || SOC_IMX27
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX21 or i.MX27.
+        config DEBUG_IMX28_UART
+                bool "i.MX28 Debug UART"
+                depends on SOC_IMX28
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX28.
+        config DEBUG_IMX31_IMX35_UART
+                bool "i.MX31 and i.MX35 Debug UART"
+                depends on SOC_IMX31 || SOC_IMX35
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX31 or i.MX35.
+        config DEBUG_IMX51_UART
+                bool "i.MX51 Debug UART"
+                depends on SOC_IMX51
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX51.
+        config DEBUG_IMX50_IMX53_UART
+                bool "i.MX50 and i.MX53 Debug UART"
+                depends on SOC_IMX50 || SOC_IMX53
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on i.MX50 or i.MX53.
+        config DEBUG_S3C_UART0
+                depends on PLAT_SAMSUNG
+                bool "Use S3C UART 0 for low-level debug"
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to UART 0. The port must have been initialised
+                  by the boot-loader before use.
+                  The uncompressor code port configuration is now handled
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
+        config DEBUG_S3C_UART1
+                depends on PLAT_SAMSUNG
+                bool "Use S3C UART 1 for low-level debug"
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to UART 1. The port must have been initialised
+                  by the boot-loader before use.
+                  The uncompressor code port configuration is now handled
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
+        config DEBUG_S3C_UART2
+                depends on PLAT_SAMSUNG
+                bool "Use S3C UART 2 for low-level debug"
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to UART 2. The port must have been initialised
+                  by the boot-loader before use.
+                  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
@@ -146,18 +251,6 @@ config OC_ETM
          buffer driver that will allow you to collect traces of the
          kernel code.
-config DEBUG_S3C_UART
-        depends on PLAT_SAMSUNG
-        int "S3C UART to use for low-level debug"
-        default "0"
-        help
-          Choice for UART for kernel low-level using S3C UARTS,
-          should be between zero and two. The port must have been
-          initialised by the boot-loader before use.
-          The uncompressor code port configuration is now handled
-          by CONFIG_S3C_LOWLEVEL_UART_PORT.
 config ARM_KPROBES_TEST
        tristate "Kprobes test module"
        depends on KPROBES && MODULES
diff --git a/arch/arm/mach-mxs/include/mach/debug-macro.S b/arch/arm/mach-mxs/include/mach/debug-macro.S
index 714570d83668..90c6b7836ad3 100644
--- a/arch/arm/mach-mxs/include/mach/debug-macro.S
+++ b/arch/arm/mach-mxs/include/mach/debug-macro.S
@@ -14,17 +14,9 @@
 #include <mach/mx23.h>
 #include <mach/mx28.h>
-#ifdef CONFIG_SOC_IMX23
+#ifdef CONFIG_DEBUG_IMX23_UART
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
 #define UART_PADDR      MX23_DUART_BASE_ADDR
-#endif
+#elif defined (CONFIG_DEBUG_IMX28_UART)
-#ifdef CONFIG_SOC_IMX28
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
 #define UART_PADDR      MX28_DUART_BASE_ADDR
 #endif
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
index fb4901c4ef04..8cc372dc66a8 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) || \
+#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT
-    defined(CONFIG_MACH_REALVIEW_PB11MP) || \
-    defined(CONFIG_MACH_REALVIEW_PBA8) || \
-    defined(CONFIG_MACH_REALVIEW_PBX)
-#ifndef DEBUG_LL_UART_OFFSET
 #define DEBUG_LL_UART_OFFSET    0x00009000
-#elif DEBUG_LL_UART_OFFSET != 0x00009000
+#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)
-#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
-#endif
-#endif
-#ifdef CONFIG_MACH_REALVIEW_PB1176
-#ifndef DEBUG_LL_UART_OFFSET
 #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
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
index a3045937fc2f..72986013c1fb 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -12,43 +12,17 @@
 */
 #include <mach/hardware.h>
-#ifdef CONFIG_SOC_IMX1
+#ifdef CONFIG_DEBUG_IMX1_UART
 #define UART_PADDR      MX1_UART1_BASE_ADDR
-#endif
+#elif defined (CONFIG_DEBUG_IMX25_UART)
-#ifdef CONFIG_SOC_IMX25
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
 #define UART_PADDR      MX25_UART1_BASE_ADDR
-#endif
+#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)
-#if defined(CONFIG_SOC_IMX21) || defined (CONFIG_SOC_IMX27)
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
 #define UART_PADDR      MX2x_UART1_BASE_ADDR
-#endif
+#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)
-#if defined(CONFIG_SOC_IMX31) || defined(CONFIG_SOC_IMX35)
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
 #define UART_PADDR      MX3x_UART1_BASE_ADDR
-#endif
+#elif defined (CONFIG_DEBUG_IMX51_UART)
-#ifdef CONFIG_SOC_IMX51
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
 #define UART_PADDR      MX51_UART1_BASE_ADDR
-#endif
+#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)
-/* iMX50/53 have same addresses, but not iMX51 */
-#if defined(CONFIG_SOC_IMX50) || defined(CONFIG_SOC_IMX53)
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
 #define UART_PADDR      MX53_UART1_BASE_ADDR
 #endif
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index b3e10659e4b8..49b14b1a7abe 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -367,4 +367,11 @@ config SAMSUNG_PD
        help
          Say Y here if you want to control Power Domain by Runtime PM.
+config DEBUG_S3C_UART
+        depends on PLAT_SAMSUNG
+        int
+        default "0" if DEBUG_S3C_UART0
+        default "1" if DEBUG_S3C_UART1
+        default "2" if DEBUG_S3C_UART2
 endif

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 0887801c324f..13c0631e6e95 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug
@@ -128,6 +128,111 @@ choice
128	Say Y here if you want the debug print routines to direct	128	Say Y here if you want the debug print routines to direct
129	their output to the second serial port on these devices.	129	their output to the second serial port on these devices.
130		130
		131	config DEBUG_IMX1_UART
		132	bool "i.MX1 Debug UART"
		133	depends on SOC_IMX1
		134	help
		135	Say Y here if you want kernel low-level debugging support
		136	on i.MX1.
		137
		138	config DEBUG_IMX23_UART
		139	bool "i.MX23 Debug UART"
		140	depends on SOC_IMX23
		141	help
		142	Say Y here if you want kernel low-level debugging support
		143	on i.MX23.
		144
		145	config DEBUG_IMX25_UART
		146	bool "i.MX25 Debug UART"
		147	depends on SOC_IMX25
		148	help
		149	Say Y here if you want kernel low-level debugging support
		150	on i.MX25.
		151
		152	config DEBUG_IMX21_IMX27_UART
		153	bool "i.MX21 and i.MX27 Debug UART"
		154	depends on SOC_IMX21 \|\| SOC_IMX27
		155	help
		156	Say Y here if you want kernel low-level debugging support
		157	on i.MX21 or i.MX27.
		158
		159	config DEBUG_IMX28_UART
		160	bool "i.MX28 Debug UART"
		161	depends on SOC_IMX28
		162	help
		163	Say Y here if you want kernel low-level debugging support
		164	on i.MX28.
		165
		166	config DEBUG_IMX31_IMX35_UART
		167	bool "i.MX31 and i.MX35 Debug UART"
		168	depends on SOC_IMX31 \|\| SOC_IMX35
		169	help
		170	Say Y here if you want kernel low-level debugging support
		171	on i.MX31 or i.MX35.
		172
		173	config DEBUG_IMX51_UART
		174	bool "i.MX51 Debug UART"
		175	depends on SOC_IMX51
		176	help
		177	Say Y here if you want kernel low-level debugging support
		178	on i.MX51.
		179
		180	config DEBUG_IMX50_IMX53_UART
		181	bool "i.MX50 and i.MX53 Debug UART"
		182	depends on SOC_IMX50 \|\| SOC_IMX53
		183	help
		184	Say Y here if you want kernel low-level debugging support
		185	on i.MX50 or i.MX53.
		186
		187	config DEBUG_S3C_UART0
		188	depends on PLAT_SAMSUNG
		189	bool "Use S3C UART 0 for low-level debug"
		190	help
		191	Say Y here if you want the debug print routines to direct
		192	their output to UART 0. The port must have been initialised
		193	by the boot-loader before use.
		194
		195	The uncompressor code port configuration is now handled
		196	by CONFIG_S3C_LOWLEVEL_UART_PORT.
		197
		198	config DEBUG_S3C_UART1
		199	depends on PLAT_SAMSUNG
		200	bool "Use S3C UART 1 for low-level debug"
		201	help
		202	Say Y here if you want the debug print routines to direct
		203	their output to UART 1. The port must have been initialised
		204	by the boot-loader before use.
		205
		206	The uncompressor code port configuration is now handled
		207	by CONFIG_S3C_LOWLEVEL_UART_PORT.
		208
		209	config DEBUG_S3C_UART2
		210	depends on PLAT_SAMSUNG
		211	bool "Use S3C UART 2 for low-level debug"
		212	help
		213	Say Y here if you want the debug print routines to direct
		214	their output to UART 2. The port must have been initialised
		215	by the boot-loader before use.
		216
		217	The uncompressor code port configuration is now handled
		218	by CONFIG_S3C_LOWLEVEL_UART_PORT.
		219
		220	config DEBUG_REALVIEW_STD_PORT
		221	bool "RealView Default UART"
		222	depends on ARCH_REALVIEW
		223	help
		224	Say Y here if you want the debug print routines to direct
		225	their output to the serial port on RealView EB, PB11MP, PBA8
		226	and PBX platforms.
		227
		228	config DEBUG_REALVIEW_PB1176_PORT
		229	bool "RealView PB1176 UART"
		230	depends on MACH_REALVIEW_PB1176
		231	help
		232	Say Y here if you want the debug print routines to direct
		233	their output to the standard serial port on the RealView
		234	PB1176 platform.
		235
131	endchoice	236	endchoice
132		237
133	config EARLY_PRINTK	238	config EARLY_PRINTK
@@ -146,18 +251,6 @@ config OC_ETM
146	buffer driver that will allow you to collect traces of the	251	buffer driver that will allow you to collect traces of the
147	kernel code.	252	kernel code.
148		253
149	config DEBUG_S3C_UART
150	depends on PLAT_SAMSUNG
151	int "S3C UART to use for low-level debug"
152	default "0"
153	help
154	Choice for UART for kernel low-level using S3C UARTS,
155	should be between zero and two. The port must have been
156	initialised by the boot-loader before use.
157
158	The uncompressor code port configuration is now handled
159	by CONFIG_S3C_LOWLEVEL_UART_PORT.
160
161	config ARM_KPROBES_TEST	254	config ARM_KPROBES_TEST
162	tristate "Kprobes test module"	255	tristate "Kprobes test module"
163	depends on KPROBES && MODULES	256	depends on KPROBES && MODULES


diff --git a/arch/arm/mach-mxs/include/mach/debug-macro.S b/arch/arm/mach-mxs/include/mach/debug-macro.S index 714570d83668..90c6b7836ad3 100644 --- a/arch/arm/mach-mxs/include/mach/debug-macro.S +++ b/arch/arm/mach-mxs/include/mach/debug-macro.S
@@ -14,17 +14,9 @@
14	#include <mach/mx23.h>	14	#include <mach/mx23.h>
15	#include <mach/mx28.h>	15	#include <mach/mx28.h>
16		16
17	#ifdef CONFIG_SOC_IMX23	17	#ifdef CONFIG_DEBUG_IMX23_UART
18	#ifdef UART_PADDR
19	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
20	#endif
21	#define UART_PADDR MX23_DUART_BASE_ADDR	18	#define UART_PADDR MX23_DUART_BASE_ADDR
22	#endif	19	#elif defined (CONFIG_DEBUG_IMX28_UART)
23
24	#ifdef CONFIG_SOC_IMX28
25	#ifdef UART_PADDR
26	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
27	#endif
28	#define UART_PADDR MX28_DUART_BASE_ADDR	20	#define UART_PADDR MX28_DUART_BASE_ADDR
29	#endif	21	#endif
30		22


diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S index fb4901c4ef04..8cc372dc66a8 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 @@
10	* published by the Free Software Foundation.	10	* published by the Free Software Foundation.
11	*/	11	*/
12		12
13	#if defined(CONFIG_MACH_REALVIEW_EB) \|\| \	13	#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT
14	defined(CONFIG_MACH_REALVIEW_PB11MP) \|\| \
15	defined(CONFIG_MACH_REALVIEW_PBA8) \|\| \
16	defined(CONFIG_MACH_REALVIEW_PBX)
17	#ifndef DEBUG_LL_UART_OFFSET
18	#define DEBUG_LL_UART_OFFSET 0x00009000	14	#define DEBUG_LL_UART_OFFSET 0x00009000
19	#elif DEBUG_LL_UART_OFFSET != 0x00009000	15	#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)
20	#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
21	#endif
22	#endif
23
24	#ifdef CONFIG_MACH_REALVIEW_PB1176
25	#ifndef DEBUG_LL_UART_OFFSET
26	#define DEBUG_LL_UART_OFFSET 0x0010c000	16	#define DEBUG_LL_UART_OFFSET 0x0010c000
27	#elif DEBUG_LL_UART_OFFSET != 0x0010c000
28	#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
29	#endif
30	#endif	17	#endif
31		18
32	#ifndef DEBUG_LL_UART_OFFSET	19	#ifndef DEBUG_LL_UART_OFFSET


diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index a3045937fc2f..72986013c1fb 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -12,43 +12,17 @@
12	*/	12	*/
13	#include <mach/hardware.h>	13	#include <mach/hardware.h>
14		14
15	#ifdef CONFIG_SOC_IMX1	15	#ifdef CONFIG_DEBUG_IMX1_UART
16	#define UART_PADDR MX1_UART1_BASE_ADDR	16	#define UART_PADDR MX1_UART1_BASE_ADDR
17	#endif	17	#elif defined (CONFIG_DEBUG_IMX25_UART)
18
19	#ifdef CONFIG_SOC_IMX25
20	#ifdef UART_PADDR
21	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
22	#endif
23	#define UART_PADDR MX25_UART1_BASE_ADDR	18	#define UART_PADDR MX25_UART1_BASE_ADDR
24	#endif	19	#elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)
25
26	#if defined(CONFIG_SOC_IMX21) \|\| defined (CONFIG_SOC_IMX27)
27	#ifdef UART_PADDR
28	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
29	#endif
30	#define UART_PADDR MX2x_UART1_BASE_ADDR	20	#define UART_PADDR MX2x_UART1_BASE_ADDR
31	#endif	21	#elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)
32
33	#if defined(CONFIG_SOC_IMX31) \|\| defined(CONFIG_SOC_IMX35)
34	#ifdef UART_PADDR
35	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
36	#endif
37	#define UART_PADDR MX3x_UART1_BASE_ADDR	22	#define UART_PADDR MX3x_UART1_BASE_ADDR
38	#endif	23	#elif defined (CONFIG_DEBUG_IMX51_UART)
39
40	#ifdef CONFIG_SOC_IMX51
41	#ifdef UART_PADDR
42	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
43	#endif
44	#define UART_PADDR MX51_UART1_BASE_ADDR	24	#define UART_PADDR MX51_UART1_BASE_ADDR
45	#endif	25	#elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)
46
47	/* iMX50/53 have same addresses, but not iMX51 */
48	#if defined(CONFIG_SOC_IMX50) \|\| defined(CONFIG_SOC_IMX53)
49	#ifdef UART_PADDR
50	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
51	#endif
52	#define UART_PADDR MX53_UART1_BASE_ADDR	26	#define UART_PADDR MX53_UART1_BASE_ADDR
53	#endif	27	#endif
54		28


diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index b3e10659e4b8..49b14b1a7abe 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig
@@ -367,4 +367,11 @@ config SAMSUNG_PD
367	help	367	help
368	Say Y here if you want to control Power Domain by Runtime PM.	368	Say Y here if you want to control Power Domain by Runtime PM.
369		369
		370	config DEBUG_S3C_UART
		371	depends on PLAT_SAMSUNG
		372	int
		373	default "0" if DEBUG_S3C_UART0
		374	default "1" if DEBUG_S3C_UART1
		375	default "2" if DEBUG_S3C_UART2
		376
370	endif	377	endif