Merge branch 'cross-platform/debug_ll' into imx/imx6q
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:24:41 +0000 (14:24 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 13:24:41 +0000 (14:24 +0100)
Conflicts:
arch/arm/Kconfig.debug

1  2 
arch/arm/Kconfig.debug
arch/arm/mach-mxs/include/mach/debug-macro.S
arch/arm/mach-realview/include/mach/debug-macro.S
arch/arm/plat-mxc/include/mach/debug-macro.S

diff --combined arch/arm/Kconfig.debug
index 0887801c324f6cd153e90f039adb32c80a470bb4,5bc7814d9a3d345b8a0a7bea6278bc5803334dcd..13c0631e6e951c845066ca85ad7555048d06072d
@@@ -128,6 -128,111 +128,111 @@@ choic
                  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,22 -251,4 +251,10 @@@ config OC_ET
          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
 +      help
 +        Perform tests of kprobes API and instruction set simulation.
 +
  endmenu
index 714570d8366842ad90676ecfe329dcb2153d4d4c,6d9870448c3d808ac86d781bc20de13140bf2c53..90c6b7836ad3f8f108f708c7820f8b92a491c332
  #include <mach/mx23.h>
  #include <mach/mx28.h>
  
- #ifdef CONFIG_SOC_IMX23
- #ifdef UART_PADDR
- #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
- #endif
+ #ifdef CONFIG_DEBUG_IMX23_UART
  #define UART_PADDR    MX23_DUART_BASE_ADDR
- #endif
- #ifdef CONFIG_SOC_IMX28
- #ifdef UART_PADDR
- #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
- #endif
+ #elif defined (CONFIG_DEBUG_IMX28_UART)
  #define UART_PADDR    MX28_DUART_BASE_ADDR
  #endif
  
  #define UART_VADDR    MXS_IO_ADDRESS(UART_PADDR)
  
 -              .macro  addruart, rp, rv
 +              .macro  addruart, rp, rv, tmp
                ldr     \rp, =UART_PADDR        @ physical
                ldr     \rv, =UART_VADDR        @ virtual
                .endm
index fb4901c4ef041841914b96700c69888f6956dc6c,0f387220a5021fb55521b5da7ea942b27af9fe53..8cc372dc66a8e19b60bff06034d96feacbad4349
   * published by the Free Software Foundation.
   */
  
- #if defined(CONFIG_MACH_REALVIEW_EB) || \
-     defined(CONFIG_MACH_REALVIEW_PB11MP) || \
-     defined(CONFIG_MACH_REALVIEW_PBA8) || \
-     defined(CONFIG_MACH_REALVIEW_PBX)
- #ifndef DEBUG_LL_UART_OFFSET
+ #ifdef CONFIG_DEBUG_REALVIEW_STD_PORT
  #define DEBUG_LL_UART_OFFSET  0x00009000
- #elif DEBUG_LL_UART_OFFSET != 0x00009000
- #warning "DEBUG_LL_UART_OFFSET already defined to a different value"
- #endif
- #endif
- #ifdef CONFIG_MACH_REALVIEW_PB1176
- #ifndef DEBUG_LL_UART_OFFSET
+ #elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)
  #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
  #error "Unknown RealView platform"
  #endif
  
 -              .macro  addruart, rp, rv
 +              .macro  addruart, rp, rv, tmp
                mov     \rp, #DEBUG_LL_UART_OFFSET
                orr     \rv, \rp, #0xfb000000   @ virtual base
                orr     \rp, \rp, #0x10000000   @ physical base
index a3045937fc2f5e7ff24b70daccd85af36ea2ae2a,07cfdbe8f06875a58c3b8e4166948ed333aacff2..72986013c1fb17fa595ae93fc1268eb9008e0e56
   */
  #include <mach/hardware.h>
  
- #ifdef CONFIG_SOC_IMX1
+ #ifdef CONFIG_DEBUG_IMX1_UART
  #define UART_PADDR    MX1_UART1_BASE_ADDR
- #endif
- #ifdef CONFIG_SOC_IMX25
- #ifdef UART_PADDR
- #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
- #endif
+ #elif defined (CONFIG_DEBUG_IMX25_UART)
  #define UART_PADDR    MX25_UART1_BASE_ADDR
- #endif
- #if defined(CONFIG_SOC_IMX21) || defined (CONFIG_SOC_IMX27)
- #ifdef UART_PADDR
- #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
- #endif
+ #elif defined (CONFIG_DEBUG_IMX21_IMX27_UART)
  #define UART_PADDR    MX2x_UART1_BASE_ADDR
- #endif
- #if defined(CONFIG_SOC_IMX31) || defined(CONFIG_SOC_IMX35)
- #ifdef UART_PADDR
- #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
- #endif
+ #elif defined (CONFIG_DEBUG_IMX31_IMX35_UART)
  #define UART_PADDR    MX3x_UART1_BASE_ADDR
- #endif
- #ifdef CONFIG_SOC_IMX51
- #ifdef UART_PADDR
- #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
- #endif
+ #elif defined (CONFIG_DEBUG_IMX51_UART)
  #define UART_PADDR    MX51_UART1_BASE_ADDR
- #endif
- /* 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
+ #elif defined (CONFIG_DEBUG_IMX50_IMX53_UART)
  #define UART_PADDR    MX53_UART1_BASE_ADDR
  #endif
  
  #define UART_VADDR    IMX_IO_ADDRESS(UART_PADDR)
  
 -              .macro  addruart, rp, rv
 +              .macro  addruart, rp, rv, tmp
                ldr     \rp, =UART_PADDR        @ physical
                ldr     \rv, =UART_VADDR        @ virtual
                .endm