Merge remote-tracking branch 'spi/fix/core' into spi-linus

[linux-drm-fsl-dcu.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index d597c6b8488ba257fa37319d9afc7dc6362933a7..5765abf5ce84576d8de31df83d709160905d7b19 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -318,6 +318,7 @@ choice
        config DEBUG_MSM_UART1
                bool "Kernel low-level debugging messages via MSM UART1"
                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+               select DEBUG_MSM_UART
                help
                  Say Y here if you want the debug print routines to direct
                  their output to the first serial port on MSM devices.
@@ -325,6 +326,7 @@ choice
        config DEBUG_MSM_UART2
                bool "Kernel low-level debugging messages via MSM UART2"
                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+               select DEBUG_MSM_UART
                help
                  Say Y here if you want the debug print routines to direct
                  their output to the second serial port on MSM devices.
@@ -332,6 +334,7 @@ choice
        config DEBUG_MSM_UART3
                bool "Kernel low-level debugging messages via MSM UART3"
                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+               select DEBUG_MSM_UART
                help
                  Say Y here if you want the debug print routines to direct
                  their output to the third serial port on MSM devices.
@@ -340,6 +343,7 @@ choice
                bool "Kernel low-level debugging messages via MSM 8660 UART"
                depends on ARCH_MSM8X60
                select MSM_HAS_DEBUG_UART_HS
+               select DEBUG_MSM_UART
                help
                  Say Y here if you want the debug print routines to direct
                  their output to the serial port on MSM 8660 devices.
@@ -348,10 +352,20 @@ choice
                bool "Kernel low-level debugging messages via MSM 8960 UART"
                depends on ARCH_MSM8960
                select MSM_HAS_DEBUG_UART_HS
+               select DEBUG_MSM_UART
                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_MSM8974_UART
+               bool "Kernel low-level debugging messages via MSM 8974 UART"
+               depends on ARCH_MSM8974
+               select MSM_HAS_DEBUG_UART_HS
+               select DEBUG_MSM_UART
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the serial port on MSM 8974 devices.
+
        config DEBUG_MVEBU_UART
                bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
                depends on ARCH_MVEBU
@@ -841,6 +855,20 @@ choice
                  options; the platform specific options are deprecated
                  and will be soon removed.
 
+       config DEBUG_LL_UART_EFM32
+               bool "Kernel low-level debugging via efm32 UART"
+               depends on ARCH_EFM32
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to an UART or USART port on efm32 based
+                 machines. Use the following addresses for DEBUG_UART_PHYS:
+
+                   0x4000c000 | USART0
+                   0x4000c400 | USART1
+                   0x4000c800 | USART2
+                   0x4000e000 | UART0
+                   0x4000e400 | UART1
+
        config DEBUG_LL_UART_PL01X
                bool "Kernel low-level debugging via ARM Ltd PL01x Primecell UART"
                help
@@ -887,11 +915,16 @@ config DEBUG_STI_UART
        bool
        depends on ARCH_STI
 
+config DEBUG_MSM_UART
+       bool
+       depends on ARCH_MSM
+
 config DEBUG_LL_INCLUDE
        string
        default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
        default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X
        default "debug/exynos.S" if DEBUG_EXYNOS_UART
+       default "debug/efm32.S" if DEBUG_LL_UART_EFM32
        default "debug/icedcc.S" if DEBUG_ICEDCC
        default "debug/imx.S" if DEBUG_IMX1_UART || \
                                 DEBUG_IMX25_UART || \
@@ -902,11 +935,7 @@ config DEBUG_LL_INCLUDE
                                 DEBUG_IMX53_UART ||\
                                 DEBUG_IMX6Q_UART || \
                                 DEBUG_IMX6SL_UART
-       default "debug/msm.S" if DEBUG_MSM_UART1 || \
-                                DEBUG_MSM_UART2 || \
-                                DEBUG_MSM_UART3 || \
-                                DEBUG_MSM8660_UART || \
-                                DEBUG_MSM8960_UART
+       default "debug/msm.S" if DEBUG_MSM_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
        default "debug/sti.S" if DEBUG_STI_UART
@@ -959,6 +988,7 @@ config DEBUG_UART_PHYS
        default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
        default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
        default 0x20201000 if DEBUG_BCM2835
+       default 0x4000e400 if DEBUG_LL_UART_EFM32
        default 0x40090000 if ARCH_LPC32XX
        default 0x40100000 if DEBUG_PXA_UART1
        default 0x42000000 if ARCH_GEMINI
@@ -989,6 +1019,7 @@ config DEBUG_UART_PHYS
        default 0xfff36000 if DEBUG_HIGHBANK_UART
        default 0xfffff700 if ARCH_IOP33X
        depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
+               DEBUG_LL_UART_EFM32 || \
                DEBUG_UART_8250 || DEBUG_UART_PL01X
 
 config DEBUG_UART_VIRT