1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
index 8e8d175e5077..91fc7cdb5dc9 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -12,32 +12,32 @@
 */
 #include <mach/hardware.h>
-#ifdef CONFIG_ARCH_MX1
+#ifdef CONFIG_SOC_IMX1
 #define UART_PADDR      MX1_UART1_BASE_ADDR
 #endif
-#ifdef CONFIG_ARCH_MX25
+#ifdef CONFIG_SOC_IMX25
 #ifdef UART_PADDR
 #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
 #endif
 #define UART_PADDR      MX25_UART1_BASE_ADDR
 #endif
-#ifdef CONFIG_ARCH_MX2
+#if defined(CONFIG_SOC_IMX21) || defined (CONFIG_SOC_IMX27)
 #ifdef UART_PADDR
 #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
 #endif
 #define UART_PADDR      MX2x_UART1_BASE_ADDR
 #endif
-#ifdef CONFIG_ARCH_MX3
+#if defined(CONFIG_SOC_IMX31) || defined(CONFIG_SOC_IMX35)
 #ifdef UART_PADDR
 #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
 #endif
 #define UART_PADDR      MX3x_UART1_BASE_ADDR
 #endif
-#ifdef CONFIG_ARCH_MX5
+#ifdef CONFIG_SOC_IMX51
 #ifdef UART_PADDR
 #error "CONFIG_DEBUG_LL is incompatible with multiple archs"
 #endif

diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 8e8d175e5077..91fc7cdb5dc9 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -12,32 +12,32 @@
12	*/	12	*/
13	#include <mach/hardware.h>	13	#include <mach/hardware.h>
14		14
15	#ifdef CONFIG_ARCH_MX1	15	#ifdef CONFIG_SOC_IMX1
16	#define UART_PADDR MX1_UART1_BASE_ADDR	16	#define UART_PADDR MX1_UART1_BASE_ADDR
17	#endif	17	#endif
18		18
19	#ifdef CONFIG_ARCH_MX25	19	#ifdef CONFIG_SOC_IMX25
20	#ifdef UART_PADDR	20	#ifdef UART_PADDR
21	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"	21	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
22	#endif	22	#endif
23	#define UART_PADDR MX25_UART1_BASE_ADDR	23	#define UART_PADDR MX25_UART1_BASE_ADDR
24	#endif	24	#endif
25		25
26	#ifdef CONFIG_ARCH_MX2	26	#if defined(CONFIG_SOC_IMX21) \|\| defined (CONFIG_SOC_IMX27)
27	#ifdef UART_PADDR	27	#ifdef UART_PADDR
28	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"	28	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
29	#endif	29	#endif
30	#define UART_PADDR MX2x_UART1_BASE_ADDR	30	#define UART_PADDR MX2x_UART1_BASE_ADDR
31	#endif	31	#endif
32		32
33	#ifdef CONFIG_ARCH_MX3	33	#if defined(CONFIG_SOC_IMX31) \|\| defined(CONFIG_SOC_IMX35)
34	#ifdef UART_PADDR	34	#ifdef UART_PADDR
35	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"	35	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
36	#endif	36	#endif
37	#define UART_PADDR MX3x_UART1_BASE_ADDR	37	#define UART_PADDR MX3x_UART1_BASE_ADDR
38	#endif	38	#endif
39		39
40	#ifdef CONFIG_ARCH_MX5	40	#ifdef CONFIG_SOC_IMX51
41	#ifdef UART_PADDR	41	#ifdef UART_PADDR
42	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"	42	#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
43	#endif	43	#endif