diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-03-04 12:03:10 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-19 07:51:21 -0400 |
commit | a2e407104769d64e01556d4c335bb6478e1e7f3c (patch) | |
tree | d7dae40913a1f6e3d3a1049ce01582b294bab2af /arch/arm/Kconfig.debug | |
parent | 7ba8022fc3a1d2434c1f038f022c5d69026319ca (diff) |
ARM: exynos: move debug-macro.S to include/debug/
The move is necessary to support early debug output on exynos
with multiplatform configurations. This implies also moving the
plat/debug-macro.S file, but we are leaving the remaining users of that
file in place, to avoid adding large numbers of extra configuration
options to Kconfig.debug
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig.debug')
-rw-r--r-- | arch/arm/Kconfig.debug | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 9b31f4311ea2..59ce26afdcc5 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
@@ -330,6 +330,7 @@ choice | |||
330 | 330 | ||
331 | config DEBUG_S3C_UART0 | 331 | config DEBUG_S3C_UART0 |
332 | depends on PLAT_SAMSUNG | 332 | depends on PLAT_SAMSUNG |
333 | select DEBUG_EXYNOS_UART if ARCH_EXYNOS | ||
333 | bool "Use S3C UART 0 for low-level debug" | 334 | bool "Use S3C UART 0 for low-level debug" |
334 | help | 335 | help |
335 | Say Y here if you want the debug print routines to direct | 336 | Say Y here if you want the debug print routines to direct |
@@ -341,6 +342,7 @@ choice | |||
341 | 342 | ||
342 | config DEBUG_S3C_UART1 | 343 | config DEBUG_S3C_UART1 |
343 | depends on PLAT_SAMSUNG | 344 | depends on PLAT_SAMSUNG |
345 | select DEBUG_EXYNOS_UART if ARCH_EXYNOS | ||
344 | bool "Use S3C UART 1 for low-level debug" | 346 | bool "Use S3C UART 1 for low-level debug" |
345 | help | 347 | help |
346 | Say Y here if you want the debug print routines to direct | 348 | Say Y here if you want the debug print routines to direct |
@@ -352,6 +354,7 @@ choice | |||
352 | 354 | ||
353 | config DEBUG_S3C_UART2 | 355 | config DEBUG_S3C_UART2 |
354 | depends on PLAT_SAMSUNG | 356 | depends on PLAT_SAMSUNG |
357 | select DEBUG_EXYNOS_UART if ARCH_EXYNOS | ||
355 | bool "Use S3C UART 2 for low-level debug" | 358 | bool "Use S3C UART 2 for low-level debug" |
356 | help | 359 | help |
357 | Say Y here if you want the debug print routines to direct | 360 | Say Y here if you want the debug print routines to direct |
@@ -363,6 +366,7 @@ choice | |||
363 | 366 | ||
364 | config DEBUG_S3C_UART3 | 367 | config DEBUG_S3C_UART3 |
365 | depends on PLAT_SAMSUNG && ARCH_EXYNOS | 368 | depends on PLAT_SAMSUNG && ARCH_EXYNOS |
369 | select DEBUG_EXYNOS_UART | ||
366 | bool "Use S3C UART 3 for low-level debug" | 370 | bool "Use S3C UART 3 for low-level debug" |
367 | help | 371 | help |
368 | Say Y here if you want the debug print routines to direct | 372 | Say Y here if you want the debug print routines to direct |
@@ -485,6 +489,9 @@ choice | |||
485 | 489 | ||
486 | endchoice | 490 | endchoice |
487 | 491 | ||
492 | config DEBUG_EXYNOS_UART | ||
493 | bool | ||
494 | |||
488 | config DEBUG_IMX_UART_PORT | 495 | config DEBUG_IMX_UART_PORT |
489 | int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \ | 496 | int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \ |
490 | DEBUG_IMX25_UART || \ | 497 | DEBUG_IMX25_UART || \ |
@@ -580,6 +587,7 @@ endchoice | |||
580 | 587 | ||
581 | config DEBUG_LL_INCLUDE | 588 | config DEBUG_LL_INCLUDE |
582 | string | 589 | string |
590 | default "debug/exynos.S" if DEBUG_EXYNOS_UART | ||
583 | default "debug/icedcc.S" if DEBUG_ICEDCC | 591 | default "debug/icedcc.S" if DEBUG_ICEDCC |
584 | default "debug/imx.S" if DEBUG_IMX1_UART || \ | 592 | default "debug/imx.S" if DEBUG_IMX1_UART || \ |
585 | DEBUG_IMX25_UART || \ | 593 | DEBUG_IMX25_UART || \ |