06125ff051
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>
53 lines
1.2 KiB
ArmAsm
53 lines
1.2 KiB
ArmAsm
/* arch/arm/mach-msm7200/include/mach/debug-macro.S
|
|
*
|
|
* Copyright (C) 2007 Google, Inc.
|
|
* Author: Brian Swetland <swetland@google.com>
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
*/
|
|
|
|
|
|
|
|
#include <mach/hardware.h>
|
|
#include <mach/msm_iomap.h>
|
|
|
|
#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
|
|
.endm
|
|
|
|
.macro senduart,rd,rx
|
|
teq \rx, #0
|
|
strne \rd, [\rx, #0x0C]
|
|
.endm
|
|
|
|
.macro waituart,rd,rx
|
|
@ wait for TX_READY
|
|
1001: ldr \rd, [\rx, #0x08]
|
|
tst \rd, #0x04
|
|
beq 1001b
|
|
.endm
|
|
#else
|
|
.macro addruart, rp, rv
|
|
mov \rv, #0xff000000
|
|
orr \rv, \rv, #0x00f00000
|
|
.endm
|
|
|
|
.macro senduart,rd,rx
|
|
.endm
|
|
|
|
.macro waituart,rd,rx
|
|
.endm
|
|
#endif
|
|
|
|
.macro busyuart,rd,rx
|
|
.endm
|