Skip to contentSkip to conversation

msm: fix compile failure when no debug uart is selected

PATCH In review Daniel Walker 2 participants 4 messages Oct 27, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 msm: fix compile failure when no debug uart is selected

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.

---
 arch/arm/mach-msm/include/mach/debug-macro.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-msm/include/mach/debug-macro.S +1 -1
index 238c4f1..2cdddb9 100644
@@ -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
Signature · 5 lines
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.
#1 lore raw

PATCH 2/2 msm: Kconfig: drop unused config options

These two config options don't exist, and aren't every going to. So I simply delete them.

---
 arch/arm/mach-msm/Kconfig |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-msm/Kconfig +0 -2
index 3d74a73..dbbcfeb 100644
@@ -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
Signature · 5 lines
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.
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] msm: Kconfig: drop unused config options

Quoted 21 lines · Daniel Walker

These two config options don't exist, and aren't every going to. So I simply delete them.

---
 arch/arm/mach-msm/Kconfig |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-msm/Kconfig +0 -1
index 3d74a73..dbbcfeb 100644
@@ -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

arch/arm/mach-msm/Kconfig config ARCH_QSD8X50 · line 37

Quoted 7 lines
arch/arm/mach-msm/Kconfig +0 -1
@@ -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
Signature · 2 lines
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Acked-by on v1 1/2
#3 lore raw
In reply to Daniel Walker
Quoted 25 lines · 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.

---
 arch/arm/mach-msm/include/mach/debug-macro.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-msm/include/mach/debug-macro.S +0 -0
index 238c4f1..2cdddb9 100644

arch/arm/mach-msm/include/mach/debug-macro.S line 25

Quoted 8 lines
arch/arm/mach-msm/include/mach/debug-macro.S +1 -1
@@ -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
Signature · 2 lines
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.