diff options
| author | Shawn Guo | 2011-08-19 06:56:59 +0200 |
|---|---|---|
| committer | Will Deacon | 2011-10-17 11:02:52 +0200 |
| commit | f350b86121c7a004a5f866333fa1d23fe30263a6 (patch) | |
| tree | 9b8dc0312aaef46faf84f723c7412095dca13326 /arch/arm/mach-mxs | |
| parent | ARM: realview: use Kconfig choice for debug UART selection (diff) | |
| download | kernel-qcow2-linux-f350b86121c7a004a5f866333fa1d23fe30263a6.tar.gz kernel-qcow2-linux-f350b86121c7a004a5f866333fa1d23fe30263a6.tar.xz kernel-qcow2-linux-f350b86121c7a004a5f866333fa1d23fe30263a6.zip | |
arm/imx: use Kconfig choice for low-level debug UART selection
Now that the DEBUG_LL UART can be selected by a Kconfig choice,
simplify the #ifdefery in debug-macro.S and add entries to the
top-level Kconfig.debug instead.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/debug-macro.S | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-mxs/include/mach/debug-macro.S b/arch/arm/mach-mxs/include/mach/debug-macro.S index 79650a1ad78d..6d9870448c3d 100644 --- a/arch/arm/mach-mxs/include/mach/debug-macro.S +++ b/arch/arm/mach-mxs/include/mach/debug-macro.S @@ -14,17 +14,9 @@ #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 |