From ddfb6a961870146ca80a3f03c5059e44a7f8f52f Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Wed, 18 Aug 2010 11:00:25 -0700 Subject: [PATCH] --- yaml --- r: 212616 b: refs/heads/master c: 46fe5f29e3062f681cc3cf07a604d82396faea89 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-msm/Kconfig | 9 +++++++++ trunk/arch/arm/mach-msm/include/mach/debug-macro.S | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 85f09313da7f..ee5d186abb2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ca06de368ddfaee47983d3d1f9eec9e2a6c23d4 +refs/heads/master: 46fe5f29e3062f681cc3cf07a604d82396faea89 diff --git a/trunk/arch/arm/mach-msm/Kconfig b/trunk/arch/arm/mach-msm/Kconfig index bb3a68bbc1e0..d658e5fb59cf 100644 --- a/trunk/arch/arm/mach-msm/Kconfig +++ b/trunk/arch/arm/mach-msm/Kconfig @@ -11,6 +11,7 @@ config ARCH_MSM7X00A select MSM_SMD_PKG3 select CPU_V6 select MSM_PROC_COMM + select HAS_MSM_DEBUG_UART_PHYS config ARCH_MSM7X30 bool "MSM7x30" @@ -21,6 +22,7 @@ config ARCH_MSM7X30 select MSM_REMOTE_SPINLOCK_DEKKERS select MSM_GPIOMUX select MSM_PROC_COMM + select HAS_MSM_DEBUG_UART_PHYS config ARCH_QSD8X50 bool "QSD8X50" @@ -31,6 +33,8 @@ config ARCH_QSD8X50 select MSM_REMOTE_SPINLOCK_LDREX select MSM_GPIOMUX select MSM_PROC_COMM + select HAS_MSM_DEBUG_UART_PHYS + endchoice config MSM_SOC_REV_A @@ -41,6 +45,9 @@ config ARCH_MSM_ARM11 config ARCH_MSM_SCORPION bool +config HAS_MSM_DEBUG_UART_PHYS + bool + config MSM_VIC bool @@ -93,6 +100,7 @@ config MSM_DEBUG_UART default 2 if MSM_DEBUG_UART2 default 3 if MSM_DEBUG_UART3 +if HAS_MSM_DEBUG_UART_PHYS choice prompt "Debug UART" @@ -110,6 +118,7 @@ choice config MSM_DEBUG_UART3 bool "UART3" endchoice +endif config MSM_SMD_PKG3 bool diff --git a/trunk/arch/arm/mach-msm/include/mach/debug-macro.S b/trunk/arch/arm/mach-msm/include/mach/debug-macro.S index 528750f307e9..238c4f132cdb 100644 --- a/trunk/arch/arm/mach-msm/include/mach/debug-macro.S +++ b/trunk/arch/arm/mach-msm/include/mach/debug-macro.S @@ -19,7 +19,7 @@ #include #include -#ifdef CONFIG_MSM_DEBUG_UART +#ifdef CONFIG_HAS_MSM_DEBUG_UART_PHYS .macro addruart, rx, tmp @ see if the MMU is enabled and select appropriate base address mrc p15, 0, \rx, c1, c0