On 10/27/2010 01:36 PM, Daniel Walker wrote: > If the board has a debug uart the user is given a choice of which > uart to use. The user can also select NONE, which means not to use one. > In most of our header files when NONE is selected nothing is defined > for MSM_DEBUG_UART_PHYS or MSM_DEBUG_UART_BASE. This causes a compile > failure in debug-macro.S which expect something to be defined there. > > Example of the failure, > > arch/arm/kernel/built-in.o: In function `hexbuf': > linux-2.6/arch/arm/kernel/debug.S:186: undefined reference to `MSM_DEBUG_UART_PHYS' > linux-2.6/arch/arm/kernel/debug.S:186: undefined reference to `MSM_DEBUG_UART_BASE' > > This fixes the compile failure by adding an ifdef to debug-macro.S > that removes all the debug uart code in the case of NONE. > > Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxxxxxx> > --- > arch/arm/mach-msm/include/mach/debug-macro.S | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S > index 238c4f1..2cdddb9 100644 > --- a/arch/arm/mach-msm/include/mach/debug-macro.S > +++ b/arch/arm/mach-msm/include/mach/debug-macro.S > @@ -19,7 +19,7 @@ > #include <mach/hardware.h> > #include <mach/msm_iomap.h> > > -#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS > +#if defined(CONFIG_HAS_MSM_DEBUG_UART_PHYS) && !defined(CONFIG_MSM_DEBUG_UART_NONE) > .macro addruart, rx, tmp > @ see if the MMU is enabled and select appropriate base address > mrc p15, 0, \rx, c1, c0 Acked-by: Bryan Huntsman <bryanh@xxxxxxxxxxxxxx> -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
