Commit 7bab7d9e authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: S5PV210: move debug-macro.S into the common space 



Move debug-macro.S from mach/include to include/debug where
all other common debug macros are.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0a90d4d6

arch/arm/Kconfig.debug

+10 −2
Original line number Diff line number Diff line
@@ -617,6 +617,7 @@ choice 
		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

		bool "Use Samsung S3C UART 0 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -627,6 +628,7 @@ choice 
		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

		bool "Use Samsung S3C UART 1 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -637,6 +639,7 @@ choice 
		depends on PLAT_SAMSUNG

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S3C24XX_UART if ARCH_S3C24XX

		select DEBUG_S5PV210_UART if ARCH_S5PV210

		bool "Use Samsung S3C UART 2 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -644,8 +647,9 @@ choice 
		  by the boot-loader before use.



	config DEBUG_S3C_UART3

		depends on PLAT_SAMSUNG && ARCH_EXYNOS

		select DEBUG_EXYNOS_UART

		depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)

		select DEBUG_EXYNOS_UART if ARCH_EXYNOS

		select DEBUG_S5PV210_UART if ARCH_S5PV210

		bool "Use Samsung S3C UART 3 for low-level debug"

		help

		  Say Y here if you want the debug print routines to direct
@@ -937,6 +941,9 @@ config DEBUG_S3C2410_UART 
config DEBUG_S3C24XX_UART

	bool



config DEBUG_S5PV210_UART

	bool



config DEBUG_OMAP2PLUS_UART

	bool

	depends on ARCH_OMAP2PLUS
@@ -997,6 +1004,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART

	default "debug/s5pv210.S" if DEBUG_S5PV210_UART

	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1

	default "debug/sti.S" if DEBUG_STI_UART

	default "debug/tegra.S" if DEBUG_TEGRA_UART

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

+8 −15
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pv210/include/mach/debug-macro.S

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * Based on arch/arm/mach-s3c6400/include/mach/debug-macro.S

/*

 * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as
@@ -12,8 +9,9 @@ 


/* pull in the relevant register and map files. */



#include <linux/serial_s3c.h>

#include <mach/map.h>

#define S3C_ADDR_BASE   0xF6000000

#define S3C_VA_UART	S3C_ADDR_BASE + 0x01000000

#define S5PV210_PA_UART	0xe2900000



	/* note, for the boot process to work we have to keep the UART

	 * virtual address aligned to an 1MiB boundary for the L1
@@ -22,7 +20,7 @@ 
	 */



	.macro addruart, rp, rv, tmp

		ldr	\rp, = S3C_PA_UART

		ldr	\rp, =S5PV210_PA_UART

		ldr	\rv, =S3C_VA_UART

#if CONFIG_DEBUG_S3C_UART != 0

		add	\rp, \rp, #(0x400 * CONFIG_DEBUG_S3C_UART)
@@ -33,9 +31,4 @@ 
#define fifo_full fifo_full_s5pv210

#define fifo_level fifo_level_s5pv210



/* include the reset of the code which will do the work, we're only

 * compiling for a single cpu processor type so the default of s3c2440

 * will be fine with us.

 */



#include <debug/samsung.S>