diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:41 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:41 -0400 |
commit | ccfa8b21f20099b950b4f2f75d2330fb149a2012 (patch) | |
tree | 60380e1417830f50683c3945e2fb9ee110418cbb /arch/arm/Kconfig.debug | |
parent | 7e0cac630c7c90f12a78131df9913657fa30243b (diff) | |
parent | f350b86121c7a004a5f866333fa1d23fe30263a6 (diff) |
Merge branch 'cross-platform/debug_ll' into imx/imx6q
Conflicts:
arch/arm/Kconfig.debug
Diffstat (limited to 'arch/arm/Kconfig.debug')
-rw-r--r-- | arch/arm/Kconfig.debug | 117 |
1 files changed, 105 insertions, 12 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 | |||
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 |