From: Bryan Huntsman <bryanh@codeaurora.org>
To: Daniel Walker <dwalker@codeaurora.org>
Cc: linux-arm-msm@vger.kernel.org, davidb@codeaurora.org,
rvaswani@codeaurora.org, gbean@codeaurora.org
Subject: Re: [PATCH 1/2] msm: fix compile failure when no debug uart is selected
Date: Wed, 27 Oct 2010 14:56:44 -0700 [thread overview]
Message-ID: <4CC8A01C.3000004@codeaurora.org> (raw)
In-Reply-To: <1288211766-7786-1-git-send-email-dwalker@codeaurora.org>
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@codeaurora.org>
> ---
> 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@codeaurora.org>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
prev parent reply other threads:[~2010-10-27 21:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-27 20:36 [PATCH 1/2] msm: fix compile failure when no debug uart is selected Daniel Walker
2010-10-27 20:36 ` [PATCH 2/2] msm: Kconfig: drop unused config options Daniel Walker
2010-10-27 21:57 ` Bryan Huntsman
2010-10-27 21:56 ` Bryan Huntsman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CC8A01C.3000004@codeaurora.org \
--to=bryanh@codeaurora.org \
--cc=davidb@codeaurora.org \
--cc=dwalker@codeaurora.org \
--cc=gbean@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=rvaswani@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).