Skip to content

Commit

Permalink
msm: fix compile failure when no debug uart is selected
Browse files Browse the repository at this point in the history
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@codeaurora.org>
  • Loading branch information
Daniel Walker committed Oct 29, 2010
1 parent bcd72c3 commit 06125ff
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-msm/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -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, rp, rv
ldr \rp, =MSM_DEBUG_UART_PHYS
ldr \rv, =MSM_DEBUG_UART_BASE
Expand Down

0 comments on commit 06125ff

Please sign in to comment.