* [PATCH 1/2] msm: fix compile failure when no debug uart is selected
@ 2010-10-27 20:36 Daniel Walker
2010-10-27 20:36 ` [PATCH 2/2] msm: Kconfig: drop unused config options Daniel Walker
2010-10-27 21:56 ` [PATCH 1/2] msm: fix compile failure when no debug uart is selected Bryan Huntsman
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Walker @ 2010-10-27 20:36 UTC (permalink / raw)
To: linux-arm-msm; +Cc: davidb, rvaswani, gbean, Daniel Walker
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
--
1.7.1
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] msm: Kconfig: drop unused config options
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 ` Daniel Walker
2010-10-27 21:57 ` Bryan Huntsman
2010-10-27 21:56 ` [PATCH 1/2] msm: fix compile failure when no debug uart is selected Bryan Huntsman
1 sibling, 1 reply; 4+ messages in thread
From: Daniel Walker @ 2010-10-27 20:36 UTC (permalink / raw)
To: linux-arm-msm; +Cc: davidb, rvaswani, gbean, Daniel Walker
These two config options don't exist, and aren't every going to.
So I simply delete them.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
arch/arm/mach-msm/Kconfig | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 3d74a73..dbbcfeb 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -21,7 +21,6 @@ config ARCH_MSM7X30
select MSM_SMD
select MSM_VIC
select CPU_V7
- select MSM_REMOTE_SPINLOCK_DEKKERS
select MSM_GPIOMUX
select MSM_PROC_COMM
select HAS_MSM_DEBUG_UART_PHYS
@@ -33,7 +32,6 @@ config ARCH_QSD8X50
select MSM_SMD
select MSM_VIC
select CPU_V7
- select MSM_REMOTE_SPINLOCK_LDREX
select MSM_GPIOMUX
select MSM_PROC_COMM
select HAS_MSM_DEBUG_UART_PHYS
--
1.7.1
--
Sent by a consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] msm: Kconfig: drop unused config options
2010-10-27 20:36 ` [PATCH 2/2] msm: Kconfig: drop unused config options Daniel Walker
@ 2010-10-27 21:57 ` Bryan Huntsman
0 siblings, 0 replies; 4+ messages in thread
From: Bryan Huntsman @ 2010-10-27 21:57 UTC (permalink / raw)
To: Daniel Walker; +Cc: linux-arm-msm, davidb, rvaswani, gbean
On 10/27/2010 01:36 PM, Daniel Walker wrote:
> These two config options don't exist, and aren't every going to.
> So I simply delete them.
>
> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
> ---
> arch/arm/mach-msm/Kconfig | 2 --
> 1 files changed, 0 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
> index 3d74a73..dbbcfeb 100644
> --- a/arch/arm/mach-msm/Kconfig
> +++ b/arch/arm/mach-msm/Kconfig
> @@ -21,7 +21,6 @@ config ARCH_MSM7X30
> select MSM_SMD
> select MSM_VIC
> select CPU_V7
> - select MSM_REMOTE_SPINLOCK_DEKKERS
> select MSM_GPIOMUX
> select MSM_PROC_COMM
> select HAS_MSM_DEBUG_UART_PHYS
> @@ -33,7 +32,6 @@ config ARCH_QSD8X50
> select MSM_SMD
> select MSM_VIC
> select CPU_V7
> - select MSM_REMOTE_SPINLOCK_LDREX
> select MSM_GPIOMUX
> select MSM_PROC_COMM
> select HAS_MSM_DEBUG_UART_PHYS
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] msm: fix compile failure when no debug uart is selected
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:56 ` Bryan Huntsman
1 sibling, 0 replies; 4+ messages in thread
From: Bryan Huntsman @ 2010-10-27 21:56 UTC (permalink / raw)
To: Daniel Walker; +Cc: linux-arm-msm, davidb, rvaswani, gbean
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-27 21:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PATCH 1/2] msm: fix compile failure when no debug uart is selected Bryan Huntsman
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).