1 files changed, 79 insertions, 79 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index e0d236d7ff73..b895a2a92da8 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -81,47 +81,14 @@ choice
        prompt "Kernel low-level debugging port"
        depends on DEBUG_LL
-        config DEBUG_LL_UART_NONE
-                bool "No low-level debugging UART"
-                help
-                  Say Y here if your platform doesn't provide a UART option
-                  below. This relies on your platform choosing the right UART
-                  definition internally in order for low-level debugging to
-                  work.
-        config DEBUG_ICEDCC
-                bool "Kernel low-level debugging via EmbeddedICE DCC channel"
-                help
-                  Say Y here if you want the debug print routines to direct
-                  their output to the EmbeddedICE macrocell's DCC channel using
-                  co-processor 14. This is known to work on the ARM9 style ICE
-                  channel and on the XScale with the PEEDI.
-                  Note that the system will appear to hang during boot if there
-                  is nothing connected to read from the DCC.
        config AT91_DEBUG_LL_DBGU0
                bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"
                depends on HAVE_AT91_DBGU0
        config AT91_DEBUG_LL_DBGU1
-                bool "Kernel low-level debugging on 9263, 9g45 and cap9"
+                bool "Kernel low-level debugging on 9263 and 9g45"
                depends on HAVE_AT91_DBGU1
-        config DEBUG_FOOTBRIDGE_COM1
-                bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"
-                depends on FOOTBRIDGE
-                help
-                  Say Y here if you want the debug print routines to direct
-                  their output to the 8250 at PCI COM1.
-        config DEBUG_DC21285_PORT
-                bool "Kernel low-level debugging messages via footbridge serial port"
-                depends on FOOTBRIDGE
-                help
-                  Say Y here if you want the debug print routines to direct
-                  their output to the serial port in the DC21285 (Footbridge).
        config DEBUG_CLPS711X_UART1
                bool "Kernel low-level debugging messages via UART1"
                depends on ARCH_CLPS711X
@@ -136,6 +103,20 @@ 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_DC21285_PORT
+                bool "Kernel low-level debugging messages via footbridge serial port"
+                depends on FOOTBRIDGE
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the serial port in the DC21285 (Footbridge).
+        config DEBUG_FOOTBRIDGE_COM1
+                bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"
+                depends on FOOTBRIDGE
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the 8250 at PCI COM1.
        config DEBUG_HIGHBANK_UART
                bool "Kernel low-level debugging messages via Highbank UART"
                depends on ARCH_HIGHBANK
@@ -206,38 +187,42 @@ choice
                  Say Y here if you want kernel low-level debugging support
                  on i.MX6Q.
-        config DEBUG_S3C_UART0
+        config DEBUG_MSM_UART1
-                depends on PLAT_SAMSUNG
+                bool "Kernel low-level debugging messages via MSM UART1"
-                bool "Use S3C UART 0 for low-level debug"
+                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
                help
                  Say Y here if you want the debug print routines to direct
-                  their output to UART 0. The port must have been initialised
+                  their output to the first serial port on MSM devices.
-                  by the boot-loader before use.
-                  The uncompressor code port configuration is now handled
-                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-        config DEBUG_S3C_UART1
+        config DEBUG_MSM_UART2
-                depends on PLAT_SAMSUNG
+                bool "Kernel low-level debugging messages via MSM UART2"
-                bool "Use S3C UART 1 for low-level debug"
+                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
                help
                  Say Y here if you want the debug print routines to direct
-                  their output to UART 1. The port must have been initialised
+                  their output to the second serial port on MSM devices.
-                  by the boot-loader before use.
-                  The uncompressor code port configuration is now handled
+        config DEBUG_MSM_UART3
-                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
+                bool "Kernel low-level debugging messages via MSM UART3"
+                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the third serial port on MSM devices.
-        config DEBUG_S3C_UART2
+        config DEBUG_MSM8660_UART
-                depends on PLAT_SAMSUNG
+                bool "Kernel low-level debugging messages via MSM 8660 UART"
-                bool "Use S3C UART 2 for low-level debug"
+                depends on ARCH_MSM8X60
+                select MSM_HAS_DEBUG_UART_HS
                help
                  Say Y here if you want the debug print routines to direct
-                  their output to UART 2. The port must have been initialised
+                  their output to the serial port on MSM 8660 devices.
-                  by the boot-loader before use.
-                  The uncompressor code port configuration is now handled
+        config DEBUG_MSM8960_UART
-                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
+                bool "Kernel low-level debugging messages via MSM 8960 UART"
+                depends on ARCH_MSM8960
+                select MSM_HAS_DEBUG_UART_HS
+                help
+                  Say Y here if you want the debug print routines to direct
+                  their output to the serial port on MSM 8960 devices.
        config DEBUG_REALVIEW_STD_PORT
                bool "RealView Default UART"
@@ -255,42 +240,57 @@ choice
                  their output to the standard serial port on the RealView
                  PB1176 platform.
-        config DEBUG_MSM_UART1
+        config DEBUG_S3C_UART0
-                bool "Kernel low-level debugging messages via MSM UART1"
+                depends on PLAT_SAMSUNG
-                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+                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 the first serial port on MSM devices.
+                  their output to UART 0. The port must have been initialised
+                  by the boot-loader before use.
-        config DEBUG_MSM_UART2
+                  The uncompressor code port configuration is now handled
-                bool "Kernel low-level debugging messages via MSM UART2"
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+        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 the second serial port on MSM devices.
+                  their output to UART 1. The port must have been initialised
+                  by the boot-loader before use.
-        config DEBUG_MSM_UART3
+                  The uncompressor code port configuration is now handled
-                bool "Kernel low-level debugging messages via MSM UART3"
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+        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 the third serial port on MSM devices.
+                  their output to UART 2. The port must have been initialised
+                  by the boot-loader before use.
-        config DEBUG_MSM8660_UART
+                  The uncompressor code port configuration is now handled
-                bool "Kernel low-level debugging messages via MSM 8660 UART"
+                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
-                depends on ARCH_MSM8X60
-                select MSM_HAS_DEBUG_UART_HS
+        config DEBUG_LL_UART_NONE
+                bool "No low-level debugging UART"
                help
-                  Say Y here if you want the debug print routines to direct
+                  Say Y here if your platform doesn't provide a UART option
-                  their output to the serial port on MSM 8660 devices.
+                  below. This relies on your platform choosing the right UART
+                  definition internally in order for low-level debugging to
+                  work.
-        config DEBUG_MSM8960_UART
+        config DEBUG_ICEDCC
-                bool "Kernel low-level debugging messages via MSM 8960 UART"
+                bool "Kernel low-level debugging via EmbeddedICE DCC channel"
-                depends on ARCH_MSM8960
-                select MSM_HAS_DEBUG_UART_HS
                help
                  Say Y here if you want the debug print routines to direct
-                  their output to the serial port on MSM 8960 devices.
+                  their output to the EmbeddedICE macrocell's DCC channel using
+                  co-processor 14. This is known to work on the ARM9 style ICE
+                  channel and on the XScale with the PEEDI.
+                  Note that the system will appear to hang during boot if there
+                  is nothing connected to read from the DCC.
 endchoice

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index e0d236d7ff73..b895a2a92da8 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug
@@ -81,47 +81,14 @@ choice
81	prompt "Kernel low-level debugging port"	81	prompt "Kernel low-level debugging port"
82	depends on DEBUG_LL	82	depends on DEBUG_LL
83		83
84	config DEBUG_LL_UART_NONE
85	bool "No low-level debugging UART"
86	help
87	Say Y here if your platform doesn't provide a UART option
88	below. This relies on your platform choosing the right UART
89	definition internally in order for low-level debugging to
90	work.
91
92	config DEBUG_ICEDCC
93	bool "Kernel low-level debugging via EmbeddedICE DCC channel"
94	help
95	Say Y here if you want the debug print routines to direct
96	their output to the EmbeddedICE macrocell's DCC channel using
97	co-processor 14. This is known to work on the ARM9 style ICE
98	channel and on the XScale with the PEEDI.
99
100	Note that the system will appear to hang during boot if there
101	is nothing connected to read from the DCC.
102
103	config AT91_DEBUG_LL_DBGU0	84	config AT91_DEBUG_LL_DBGU0
104	bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"	85	bool "Kernel low-level debugging on rm9200, 9260/9g20, 9261/9g10 and 9rl"
105	depends on HAVE_AT91_DBGU0	86	depends on HAVE_AT91_DBGU0
106		87
107	config AT91_DEBUG_LL_DBGU1	88	config AT91_DEBUG_LL_DBGU1
108	bool "Kernel low-level debugging on 9263, 9g45 and cap9"	89	bool "Kernel low-level debugging on 9263 and 9g45"
109	depends on HAVE_AT91_DBGU1	90	depends on HAVE_AT91_DBGU1
110		91
111	config DEBUG_FOOTBRIDGE_COM1
112	bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"
113	depends on FOOTBRIDGE
114	help
115	Say Y here if you want the debug print routines to direct
116	their output to the 8250 at PCI COM1.
117
118	config DEBUG_DC21285_PORT
119	bool "Kernel low-level debugging messages via footbridge serial port"
120	depends on FOOTBRIDGE
121	help
122	Say Y here if you want the debug print routines to direct
123	their output to the serial port in the DC21285 (Footbridge).
124
125	config DEBUG_CLPS711X_UART1	92	config DEBUG_CLPS711X_UART1
126	bool "Kernel low-level debugging messages via UART1"	93	bool "Kernel low-level debugging messages via UART1"
127	depends on ARCH_CLPS711X	94	depends on ARCH_CLPS711X
@@ -136,6 +103,20 @@ choice
136	Say Y here if you want the debug print routines to direct	103	Say Y here if you want the debug print routines to direct
137	their output to the second serial port on these devices.	104	their output to the second serial port on these devices.
138		105
		106	config DEBUG_DC21285_PORT
		107	bool "Kernel low-level debugging messages via footbridge serial port"
		108	depends on FOOTBRIDGE
		109	help
		110	Say Y here if you want the debug print routines to direct
		111	their output to the serial port in the DC21285 (Footbridge).
		112
		113	config DEBUG_FOOTBRIDGE_COM1
		114	bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"
		115	depends on FOOTBRIDGE
		116	help
		117	Say Y here if you want the debug print routines to direct
		118	their output to the 8250 at PCI COM1.
		119
139	config DEBUG_HIGHBANK_UART	120	config DEBUG_HIGHBANK_UART
140	bool "Kernel low-level debugging messages via Highbank UART"	121	bool "Kernel low-level debugging messages via Highbank UART"
141	depends on ARCH_HIGHBANK	122	depends on ARCH_HIGHBANK
@@ -206,38 +187,42 @@ choice
206	Say Y here if you want kernel low-level debugging support	187	Say Y here if you want kernel low-level debugging support
207	on i.MX6Q.	188	on i.MX6Q.
208		189
209	config DEBUG_S3C_UART0	190	config DEBUG_MSM_UART1
210	depends on PLAT_SAMSUNG	191	bool "Kernel low-level debugging messages via MSM UART1"
211	bool "Use S3C UART 0 for low-level debug"	192	depends on ARCH_MSM7X00A \|\| ARCH_MSM7X30 \|\| ARCH_QSD8X50
212	help	193	help
213	Say Y here if you want the debug print routines to direct	194	Say Y here if you want the debug print routines to direct
214	their output to UART 0. The port must have been initialised	195	their output to the first serial port on MSM devices.
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		196
220	config DEBUG_S3C_UART1	197	config DEBUG_MSM_UART2
221	depends on PLAT_SAMSUNG	198	bool "Kernel low-level debugging messages via MSM UART2"
222	bool "Use S3C UART 1 for low-level debug"	199	depends on ARCH_MSM7X00A \|\| ARCH_MSM7X30 \|\| ARCH_QSD8X50
223	help	200	help
224	Say Y here if you want the debug print routines to direct	201	Say Y here if you want the debug print routines to direct
225	their output to UART 1. The port must have been initialised	202	their output to the second serial port on MSM devices.
226	by the boot-loader before use.
227		203
228	The uncompressor code port configuration is now handled	204	config DEBUG_MSM_UART3
229	by CONFIG_S3C_LOWLEVEL_UART_PORT.	205	bool "Kernel low-level debugging messages via MSM UART3"
		206	depends on ARCH_MSM7X00A \|\| ARCH_MSM7X30 \|\| ARCH_QSD8X50
		207	help
		208	Say Y here if you want the debug print routines to direct
		209	their output to the third serial port on MSM devices.
230		210
231	config DEBUG_S3C_UART2	211	config DEBUG_MSM8660_UART
232	depends on PLAT_SAMSUNG	212	bool "Kernel low-level debugging messages via MSM 8660 UART"
233	bool "Use S3C UART 2 for low-level debug"	213	depends on ARCH_MSM8X60
		214	select MSM_HAS_DEBUG_UART_HS
234	help	215	help
235	Say Y here if you want the debug print routines to direct	216	Say Y here if you want the debug print routines to direct
236	their output to UART 2. The port must have been initialised	217	their output to the serial port on MSM 8660 devices.
237	by the boot-loader before use.
238		218
239	The uncompressor code port configuration is now handled	219	config DEBUG_MSM8960_UART
240	by CONFIG_S3C_LOWLEVEL_UART_PORT.	220	bool "Kernel low-level debugging messages via MSM 8960 UART"
		221	depends on ARCH_MSM8960
		222	select MSM_HAS_DEBUG_UART_HS
		223	help
		224	Say Y here if you want the debug print routines to direct
		225	their output to the serial port on MSM 8960 devices.
241		226
242	config DEBUG_REALVIEW_STD_PORT	227	config DEBUG_REALVIEW_STD_PORT
243	bool "RealView Default UART"	228	bool "RealView Default UART"
@@ -255,42 +240,57 @@ choice
255	their output to the standard serial port on the RealView	240	their output to the standard serial port on the RealView
256	PB1176 platform.	241	PB1176 platform.
257		242
258	config DEBUG_MSM_UART1	243	config DEBUG_S3C_UART0
259	bool "Kernel low-level debugging messages via MSM UART1"	244	depends on PLAT_SAMSUNG
260	depends on ARCH_MSM7X00A \|\| ARCH_MSM7X30 \|\| ARCH_QSD8X50	245	bool "Use S3C UART 0 for low-level debug"
261	help	246	help
262	Say Y here if you want the debug print routines to direct	247	Say Y here if you want the debug print routines to direct
263	their output to the first serial port on MSM devices.	248	their output to UART 0. The port must have been initialised
		249	by the boot-loader before use.
264		250
265	config DEBUG_MSM_UART2	251	The uncompressor code port configuration is now handled
266	bool "Kernel low-level debugging messages via MSM UART2"	252	by CONFIG_S3C_LOWLEVEL_UART_PORT.
267	depends on ARCH_MSM7X00A \|\| ARCH_MSM7X30 \|\| ARCH_QSD8X50	253
		254	config DEBUG_S3C_UART1
		255	depends on PLAT_SAMSUNG
		256	bool "Use S3C UART 1 for low-level debug"
268	help	257	help
269	Say Y here if you want the debug print routines to direct	258	Say Y here if you want the debug print routines to direct
270	their output to the second serial port on MSM devices.	259	their output to UART 1. The port must have been initialised
		260	by the boot-loader before use.
271		261
272	config DEBUG_MSM_UART3	262	The uncompressor code port configuration is now handled
273	bool "Kernel low-level debugging messages via MSM UART3"	263	by CONFIG_S3C_LOWLEVEL_UART_PORT.
274	depends on ARCH_MSM7X00A \|\| ARCH_MSM7X30 \|\| ARCH_QSD8X50	264
		265	config DEBUG_S3C_UART2
		266	depends on PLAT_SAMSUNG
		267	bool "Use S3C UART 2 for low-level debug"
275	help	268	help
276	Say Y here if you want the debug print routines to direct	269	Say Y here if you want the debug print routines to direct
277	their output to the third serial port on MSM devices.	270	their output to UART 2. The port must have been initialised
		271	by the boot-loader before use.
278		272
279	config DEBUG_MSM8660_UART	273	The uncompressor code port configuration is now handled
280	bool "Kernel low-level debugging messages via MSM 8660 UART"	274	by CONFIG_S3C_LOWLEVEL_UART_PORT.
281	depends on ARCH_MSM8X60	275
282	select MSM_HAS_DEBUG_UART_HS	276	config DEBUG_LL_UART_NONE
		277	bool "No low-level debugging UART"
283	help	278	help
284	Say Y here if you want the debug print routines to direct	279	Say Y here if your platform doesn't provide a UART option
285	their output to the serial port on MSM 8660 devices.	280	below. This relies on your platform choosing the right UART
		281	definition internally in order for low-level debugging to
		282	work.
286		283
287	config DEBUG_MSM8960_UART	284	config DEBUG_ICEDCC
288	bool "Kernel low-level debugging messages via MSM 8960 UART"	285	bool "Kernel low-level debugging via EmbeddedICE DCC channel"
289	depends on ARCH_MSM8960
290	select MSM_HAS_DEBUG_UART_HS
291	help	286	help
292	Say Y here if you want the debug print routines to direct	287	Say Y here if you want the debug print routines to direct
293	their output to the serial port on MSM 8960 devices.	288	their output to the EmbeddedICE macrocell's DCC channel using
		289	co-processor 14. This is known to work on the ARM9 style ICE
		290	channel and on the XScale with the PEEDI.
		291
		292	Note that the system will appear to hang during boot if there
		293	is nothing connected to read from the DCC.
294		294
295	endchoice	295	endchoice
296		296