Merge branch 'cross-platform/debug_ll' into imx/imx6q

[pandora-kernel.git] / arch / arm / mach-realview / include / mach / debug-macro.S

diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
index fb4901c..8cc372d 100644 (file)
--- a/arch/arm/mach-realview/include/mach/debug-macro.S
+++ b/arch/arm/mach-realview/include/mach/debug-macro.S
@@ -10,23 +10,10 @@
  * published by the Free Software Foundation.
  */
 
  * 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
 #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
 #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
 #endif
 
 #ifndef DEBUG_LL_UART_OFFSET