| Message ID | 1305823648-2428-8-git-send-email-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. Sascha Hauer wrote: > CONFIG_ARCH_* are deprecated, so remove one user. > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > arch/arm/plat-mxc/include/mach/debug-macro.S | 10 +++++----- > 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 8e8d175..75a8933 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 Hm, does defined work without ()? Didn't know it... WBR, Sergei
On Thu, May 19, 2011 at 08:54:19PM +0400, Sergei Shtylyov wrote: > Hello. > > Sascha Hauer wrote: > > >CONFIG_ARCH_* are deprecated, so remove one user. > > >Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > >--- > > arch/arm/plat-mxc/include/mach/debug-macro.S | 10 +++++----- > > 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 8e8d175..75a8933 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 > > Hm, does defined work without ()? Didn't know it... Me neither, it was an accident. Maybe better to add the braces. Sascha
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 8e8d175..75a8933 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
CONFIG_ARCH_* are deprecated, so remove one user. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- arch/arm/plat-mxc/include/mach/debug-macro.S | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)