Commit 6d07917e authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown
Browse files

ARM: msm: Move debug-macro.S to include/debug 



One more step to allowing MSM to participate in the
multi-platform defconfig.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
[davidb: Comment cleanup requested by sboyd]
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 0c211c29

arch/arm/Kconfig.debug

+7 −2
Original line number Diff line number Diff line
@@ -777,6 +777,11 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX6SL_UART

	default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \

				      DEBUG_KEYSTONE_UART1

	default "debug/msm.S" if DEBUG_MSM_UART1 || \

				 DEBUG_MSM_UART2 || \

				 DEBUG_MSM_UART3 || \

				 DEBUG_MSM8660_UART || \

				 DEBUG_MSM8960_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART || \

				   DEBUG_MVEBU_UART_ALTERNATE

	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
@@ -804,13 +809,13 @@ config DEBUG_LL_INCLUDE 


config DEBUG_UNCOMPRESS

	bool

	default y if ARCH_MULTIPLATFORM && DEBUG_LL && \

	default y if (ARCH_MULTIPLATFORM || ARCH_MSM) && DEBUG_LL && \

		     !DEBUG_OMAP2PLUS_UART && \

		     !DEBUG_TEGRA_UART



config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/mach-msm/include/mach/debug-macro.S→arch/arm/include/debug/msm.S

+30 −2
Original line number Diff line number Diff line
@@ -15,8 +15,36 @@ 
 *

 */



#include <mach/hardware.h>

#include <mach/msm_iomap.h>

#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_QSD8X50)

#define MSM_UART1_PHYS        0xA9A00000

#define MSM_UART2_PHYS        0xA9B00000

#define MSM_UART3_PHYS        0xA9C00000

#elif defined(CONFIG_ARCH_MSM7X30)

#define MSM_UART1_PHYS        0xACA00000

#define MSM_UART2_PHYS        0xACB00000

#define MSM_UART3_PHYS        0xACC00000

#endif



#if defined(CONFIG_DEBUG_MSM_UART1)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART1_PHYS

#elif defined(CONFIG_DEBUG_MSM_UART2)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART2_PHYS

#elif defined(CONFIG_DEBUG_MSM_UART3)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART3_PHYS

#endif



#ifdef CONFIG_DEBUG_MSM8660_UART

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x19C40000

#endif



#ifdef CONFIG_DEBUG_MSM8960_UART

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x16440000

#endif



	.macro	addruart, rp, rv, tmp

#ifdef MSM_DEBUG_UART_PHYS

arch/arm/mach-msm/include/mach/msm_iomap-8960.h

+0 −5
Original line number Diff line number Diff line
@@ -38,9 +38,4 @@ 
#define MSM8960_TMR0_PHYS	0x0208A000

#define MSM8960_TMR0_SIZE	SZ_4K



#ifdef CONFIG_DEBUG_MSM8960_UART

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x16440000

#endif



#endif

arch/arm/mach-msm/include/mach/msm_iomap-8x60.h

+0 −5
Original line number Diff line number Diff line
@@ -41,9 +41,4 @@ 
#define MSM8X60_TMR0_PHYS	0x02040000

#define MSM8X60_TMR0_SIZE	SZ_4K



#ifdef CONFIG_DEBUG_MSM8660_UART

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x19C40000

#endif



#endif

arch/arm/mach-msm/include/mach/msm_iomap.h

+0 −12
Original line number Diff line number Diff line
@@ -48,18 +48,6 @@ 
#include "msm_iomap-8x60.h"

#include "msm_iomap-8960.h"



#define MSM_DEBUG_UART_SIZE	SZ_4K

#if defined(CONFIG_DEBUG_MSM_UART1)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART1_PHYS

#elif defined(CONFIG_DEBUG_MSM_UART2)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART2_PHYS

#elif defined(CONFIG_DEBUG_MSM_UART3)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART3_PHYS

#endif



/* Virtual addresses shared across all MSM targets. */

#define MSM_CSR_BASE		IOMEM(0xE0001000)

#define MSM_TMR_BASE		IOMEM(0xF0200000)