ARM: debug: move 8250 debug include into arch/arm/include/debug/

Now that the 8250 debug include can stand alone without requiring platforms to provide any macros, move it into the debug directory so it can be directly included. This allows us to get rid of a lot of debug-macros include files. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
author: Russell King <rmk+kernel@arm.linux.org.uk> 2013-07-06 19:11:35 -0400
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2013-08-25 12:11:02 -0400
commit: 2facbc88733b34e1f992cde054c88b8e07607043 (patch)
tree: 5c0a61096777f07291b0e7db3c49a4d05441aa38
parent: c3faa9b7573bf8668869c0ef3075430dc9f053c6 (diff)
20 files changed, 3 insertions, 212 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index cf4262ec0f60..f27f8eebded1 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -830,6 +830,7 @@ config DEBUG_STI_UART
 config DEBUG_LL_INCLUDE
        string
+        default "debug/8250.S" if DEBUG_UART_8250
        default "debug/bcm2835.S" if DEBUG_BCM2835
        default "debug/cns3xxx.S" if DEBUG_CNS3XXX
        default "debug/exynos.S" if DEBUG_EXYNOS_UART
@@ -846,21 +847,14 @@ config DEBUG_LL_INCLUDE
                                 DEBUG_IMX6SL_UART
        default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
                                      DEBUG_KEYSTONE_UART1
-        default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
-                                   DEBUG_MVEBU_UART_ALTERNATE
        default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
        default "debug/nomadik.S" if DEBUG_NOMADIK_UART
-        default "debug/nspire.S" if     DEBUG_NSPIRE_CX_UART || \
+        default "debug/nspire.S" if DEBUG_NSPIRE_CX_UART
-                                        DEBUG_NSPIRE_CLASSIC_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
        default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
-        default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
-                                 DEBUG_MMP_UART3
-        default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
        default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
        default "debug/sti.S" if DEBUG_STI_UART
-        default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
        default "debug/tegra.S" if DEBUG_TEGRA_UART
        default "debug/u300.S" if DEBUG_U300_UART
        default "debug/ux500.S" if DEBUG_UX500_UART
diff --git a/arch/arm/include/asm/hardware/debug-8250.S b/arch/arm/include/debug/8250.S
index ea5f1710b524..92cab395677a 100644
--- a/arch/arm/include/asm/hardware/debug-8250.S
+++ b/arch/arm/include/debug/8250.S
@@ -1,5 +1,5 @@
 /*
- * arch/arm/include/asm/hardware/debug-8250.S
+ * arch/arm/include/debug/8250.S
 *
 *  Copyright (C) 1994-2013 Russell King
 *
@@ -9,16 +9,12 @@
 */
 #include <linux/serial_reg.h>
-#ifdef CONFIG_DEBUG_UART_PHYS
                .macro  addruart, rp, rv, tmp
                ldr     \rp, =CONFIG_DEBUG_UART_PHYS
                ldr     \rv, =CONFIG_DEBUG_UART_VIRT
                .endm
-#endif
-#ifndef UART_SHIFT
 #define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT
-#endif
                .macro  senduart,rd,rx
                strb    \rd, [\rx, #UART_TX << UART_SHIFT]
diff --git a/arch/arm/include/debug/mvebu.S b/arch/arm/include/debug/mvebu.S
deleted file mode 100644
index 6309be5238e6..000000000000
--- a/arch/arm/include/debug/mvebu.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Early serial output macro for Marvell  SoC
- *
- * Copyright (C) 2012 Marvell
- *
- * Lior Amsalem <alior@marvell.com>
- * Gregory Clement <gregory.clement@free-electrons.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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S
index 3e9329aa17b9..9c2fbeceedd0 100644
--- a/arch/arm/include/debug/nspire.S
+++ b/arch/arm/include/debug/nspire.S
@@ -19,7 +19,3 @@
 #include <asm/hardware/debug-pl01x.S>
 #endif
-#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART
-#include <asm/hardware/debug-8250.S>
-#endif
diff --git a/arch/arm/include/debug/pxa.S b/arch/arm/include/debug/pxa.S
deleted file mode 100644
index 09e54f357894..000000000000
--- a/arch/arm/include/debug/pxa.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Early serial output macro for Marvell PXA/MMP SoC
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * Copyright (C) 2013 Haojian Zhuang
- *
- * 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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/include/debug/rockchip.S b/arch/arm/include/debug/rockchip.S
deleted file mode 100644
index 3ad023899820..000000000000
--- a/arch/arm/include/debug/rockchip.S
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Early serial output macro for Rockchip SoCs
- *
- * Copyright (C) 2012 Maxime Ripard
- *
- * Maxime Ripard <maxime.ripard@free-electrons.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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
deleted file mode 100644
index 4c3d89cfeb8f..000000000000
--- a/arch/arm/include/debug/sunxi.S
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Early serial output macro for Allwinner A1X SoCs
- *
- * Copyright (C) 2012 Maxime Ripard
- *
- * Maxime Ripard <maxime.ripard@free-electrons.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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-dove/include/mach/debug-macro.S b/arch/arm/mach-dove/include/mach/debug-macro.S
deleted file mode 100644
index 9b85a81588ea..000000000000
--- a/arch/arm/mach-dove/include/mach/debug-macro.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * arch/arm/mach-dove/include/mach/debug-macro.S
- *
- * 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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-ebsa110/include/mach/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S
deleted file mode 100644
index 0cea548ce305..000000000000
--- a/arch/arm/mach-ebsa110/include/mach/debug-macro.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/* arch/arm/mach-ebsa110/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * 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
- * published by the Free Software Foundation.
- *
-**/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index 553c47de578d..02247f313e94 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -13,9 +13,6 @@
 #include <asm/hardware/dec21285.h>
-#ifndef CONFIG_DEBUG_DC21285_PORT
-#include <asm/hardware/debug-8250.S>
-#else
 #include <mach/hardware.h>
        /* For EBSA285 debugging */
                .equ    dc21285_high, ARMCSR_BASE & 0xff000000
@@ -43,4 +40,3 @@
                .macro  waituart,rd,rx
                .endm
-#endif
diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S
deleted file mode 100644
index 9dabd4bfcda2..000000000000
--- a/arch/arm/mach-gemini/include/mach/debug-macro.S
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Copyright (C) 2001-2006 Storlink, Corp.
- *  Copyright (C) 2008-2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
- *
- * 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
- * published by the Free Software Foundation.
- */
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-iop13xx/include/mach/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S
deleted file mode 100644
index 90b5e64ee4ce..000000000000
--- a/arch/arm/mach-iop13xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-iop13xx/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * 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
- * published by the Free Software Foundation.
- */
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-iop32x/include/mach/debug-macro.S b/arch/arm/mach-iop32x/include/mach/debug-macro.S
deleted file mode 100644
index 7ea745e73f5f..000000000000
--- a/arch/arm/mach-iop32x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-iop32x/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * 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
- * published by the Free Software Foundation.
- */
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-iop33x/include/mach/debug-macro.S b/arch/arm/mach-iop33x/include/mach/debug-macro.S
deleted file mode 100644
index 52781ae2f29c..000000000000
--- a/arch/arm/mach-iop33x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-iop33x/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * 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
- * published by the Free Software Foundation.
- */
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S
deleted file mode 100644
index ff706fa2f406..000000000000
--- a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,12 +0,0 @@
-/* arch/arm/mach-ixp4xx/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * 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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S
deleted file mode 100644
index 011ec2526b8a..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/debug-macro.S
- *
- * 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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S b/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
deleted file mode 100644
index c7bb4bcbe2e2..000000000000
--- a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * arch/arm/mach-lpc32xx/include/mach/debug-macro.S
- *
- * Author: Kevin Wells <kevin.wells@nxp.com>
- *
- * Copyright (C) 2010 NXP Semiconductors
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S
deleted file mode 100644
index c8284a2171fd..000000000000
--- a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * arch/arm/mach-mv78xx0/include/mach/debug-macro.S
- *
- * 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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S
deleted file mode 100644
index 7489963fd8b4..000000000000
--- a/arch/arm/mach-orion5x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * arch/arm/mach-orion5x/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * 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
- * published by the Free Software Foundation.
-*/
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-rpc/include/mach/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S
deleted file mode 100644
index 88a575ebd268..000000000000
--- a/arch/arm/mach-rpc/include/mach/debug-macro.S
+++ /dev/null
@@ -1,13 +0,0 @@
-/* arch/arm/mach-rpc/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * 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
- * published by the Free Software Foundation.
- *
-*/
-#include <asm/hardware/debug-8250.S>
author	Russell King <rmk+kernel@arm.linux.org.uk>	2013-07-06 19:11:35 -0400
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2013-08-25 12:11:02 -0400
commit	2facbc88733b34e1f992cde054c88b8e07607043 (patch)
tree	5c0a61096777f07291b0e7db3c49a4d05441aa38
parent	c3faa9b7573bf8668869c0ef3075430dc9f053c6 (diff)

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index cf4262ec0f60..f27f8eebded1 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug
@@ -830,6 +830,7 @@ config DEBUG_STI_UART
830		830
831	config DEBUG_LL_INCLUDE	831	config DEBUG_LL_INCLUDE
832	string	832	string
		833	default "debug/8250.S" if DEBUG_UART_8250
833	default "debug/bcm2835.S" if DEBUG_BCM2835	834	default "debug/bcm2835.S" if DEBUG_BCM2835
834	default "debug/cns3xxx.S" if DEBUG_CNS3XXX	835	default "debug/cns3xxx.S" if DEBUG_CNS3XXX
835	default "debug/exynos.S" if DEBUG_EXYNOS_UART	836	default "debug/exynos.S" if DEBUG_EXYNOS_UART
@@ -846,21 +847,14 @@ config DEBUG_LL_INCLUDE
846	DEBUG_IMX6SL_UART	847	DEBUG_IMX6SL_UART
847	default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 \|\| \	848	default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 \|\| \
848	DEBUG_KEYSTONE_UART1	849	DEBUG_KEYSTONE_UART1
849	default "debug/mvebu.S" if DEBUG_MVEBU_UART \|\| \
850	DEBUG_MVEBU_UART_ALTERNATE
851	default "debug/mxs.S" if DEBUG_IMX23_UART \|\| DEBUG_IMX28_UART	850	default "debug/mxs.S" if DEBUG_IMX23_UART \|\| DEBUG_IMX28_UART
852	default "debug/nomadik.S" if DEBUG_NOMADIK_UART	851	default "debug/nomadik.S" if DEBUG_NOMADIK_UART
853	default "debug/nspire.S" if DEBUG_NSPIRE_CX_UART \|\| \	852	default "debug/nspire.S" if DEBUG_NSPIRE_CX_UART
854	DEBUG_NSPIRE_CLASSIC_UART
855	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART	853	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
856	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART	854	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
857	default "debug/pxa.S" if DEBUG_PXA_UART1 \|\| DEBUG_MMP_UART2 \|\| \
858	DEBUG_MMP_UART3
859	default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
860	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 \|\| DEBUG_SIRFMARCO_UART1	855	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 \|\| DEBUG_SIRFMARCO_UART1
861	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART	856	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
862	default "debug/sti.S" if DEBUG_STI_UART	857	default "debug/sti.S" if DEBUG_STI_UART
863	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 \|\| DEBUG_SUNXI_UART1
864	default "debug/tegra.S" if DEBUG_TEGRA_UART	858	default "debug/tegra.S" if DEBUG_TEGRA_UART
865	default "debug/u300.S" if DEBUG_U300_UART	859	default "debug/u300.S" if DEBUG_U300_UART
866	default "debug/ux500.S" if DEBUG_UX500_UART	860	default "debug/ux500.S" if DEBUG_UX500_UART


diff --git a/arch/arm/include/asm/hardware/debug-8250.S b/arch/arm/include/debug/8250.S index ea5f1710b524..92cab395677a 100644 --- a/arch/arm/include/asm/hardware/debug-8250.S +++ b/arch/arm/include/debug/8250.S
@@ -1,5 +1,5 @@
1	/*	1	/*
2	* arch/arm/include/asm/hardware/debug-8250.S	2	* arch/arm/include/debug/8250.S
3	*	3	*
4	* Copyright (C) 1994-2013 Russell King	4	* Copyright (C) 1994-2013 Russell King
5	*	5	*
@@ -9,16 +9,12 @@
9	*/	9	*/
10	#include <linux/serial_reg.h>	10	#include <linux/serial_reg.h>
11		11
12	#ifdef CONFIG_DEBUG_UART_PHYS
13	.macro addruart, rp, rv, tmp	12	.macro addruart, rp, rv, tmp
14	ldr \rp, =CONFIG_DEBUG_UART_PHYS	13	ldr \rp, =CONFIG_DEBUG_UART_PHYS
15	ldr \rv, =CONFIG_DEBUG_UART_VIRT	14	ldr \rv, =CONFIG_DEBUG_UART_VIRT
16	.endm	15	.endm
17	#endif
18		16
19	#ifndef UART_SHIFT
20	#define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT	17	#define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT
21	#endif
22		18
23	.macro senduart,rd,rx	19	.macro senduart,rd,rx
24	strb \rd, [\rx, #UART_TX << UART_SHIFT]	20	strb \rd, [\rx, #UART_TX << UART_SHIFT]


diff --git a/arch/arm/include/debug/mvebu.S b/arch/arm/include/debug/mvebu.S deleted file mode 100644 index 6309be5238e6..000000000000 --- a/arch/arm/include/debug/mvebu.S +++ /dev/null
@@ -1,13 +0,0 @@
1	/*
2	* Early serial output macro for Marvell SoC
3	*
4	* Copyright (C) 2012 Marvell
5	*
6	* Lior Amsalem <alior@marvell.com>
7	* Gregory Clement <gregory.clement@free-electrons.com>
8	*
9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License version 2 as
11	* published by the Free Software Foundation.
12	*/
13	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S index 3e9329aa17b9..9c2fbeceedd0 100644 --- a/arch/arm/include/debug/nspire.S +++ b/arch/arm/include/debug/nspire.S
@@ -19,7 +19,3 @@
19		19
20	#include <asm/hardware/debug-pl01x.S>	20	#include <asm/hardware/debug-pl01x.S>
21	#endif	21	#endif
22
23	#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART
24	#include <asm/hardware/debug-8250.S>
25	#endif


diff --git a/arch/arm/include/debug/pxa.S b/arch/arm/include/debug/pxa.S deleted file mode 100644 index 09e54f357894..000000000000 --- a/arch/arm/include/debug/pxa.S +++ /dev/null
@@ -1,13 +0,0 @@
1	/*
2	* Early serial output macro for Marvell PXA/MMP SoC
3	*
4	* Copyright (C) 1994-1999 Russell King
5	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
6	*
7	* Copyright (C) 2013 Haojian Zhuang
8	*
9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License version 2 as
11	* published by the Free Software Foundation.
12	*/
13	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/include/debug/rockchip.S b/arch/arm/include/debug/rockchip.S deleted file mode 100644 index 3ad023899820..000000000000 --- a/arch/arm/include/debug/rockchip.S +++ /dev/null
@@ -1,12 +0,0 @@
1	/*
2	* Early serial output macro for Rockchip SoCs
3	*
4	* Copyright (C) 2012 Maxime Ripard
5	*
6	* Maxime Ripard <maxime.ripard@free-electrons.com>
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License version 2 as
10	* published by the Free Software Foundation.
11	*/
12	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S deleted file mode 100644 index 4c3d89cfeb8f..000000000000 --- a/arch/arm/include/debug/sunxi.S +++ /dev/null
@@ -1,12 +0,0 @@
1	/*
2	* Early serial output macro for Allwinner A1X SoCs
3	*
4	* Copyright (C) 2012 Maxime Ripard
5	*
6	* Maxime Ripard <maxime.ripard@free-electrons.com>
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License version 2 as
10	* published by the Free Software Foundation.
11	*/
12	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-dove/include/mach/debug-macro.S b/arch/arm/mach-dove/include/mach/debug-macro.S deleted file mode 100644 index 9b85a81588ea..000000000000 --- a/arch/arm/mach-dove/include/mach/debug-macro.S +++ /dev/null
@@ -1,8 +0,0 @@
1	/*
2	* arch/arm/mach-dove/include/mach/debug-macro.S
3	*
4	* This program is free software; you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License version 2 as
6	* published by the Free Software Foundation.
7	*/
8	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-ebsa110/include/mach/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S deleted file mode 100644 index 0cea548ce305..000000000000 --- a/arch/arm/mach-ebsa110/include/mach/debug-macro.S +++ /dev/null
@@ -1,13 +0,0 @@
1	/* arch/arm/mach-ebsa110/include/mach/debug-macro.S
2	*
3	* Debugging macro include header
4	*
5	* Copyright (C) 1994-1999 Russell King
6	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License version 2 as
10	* published by the Free Software Foundation.
11	*
12	**/
13	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S index 553c47de578d..02247f313e94 100644 --- a/arch/arm/mach-footbridge/include/mach/debug-macro.S +++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -13,9 +13,6 @@
13		13
14	#include <asm/hardware/dec21285.h>	14	#include <asm/hardware/dec21285.h>
15		15
16	#ifndef CONFIG_DEBUG_DC21285_PORT
17	#include <asm/hardware/debug-8250.S>
18	#else
19	#include <mach/hardware.h>	16	#include <mach/hardware.h>
20	/* For EBSA285 debugging */	17	/* For EBSA285 debugging */
21	.equ dc21285_high, ARMCSR_BASE & 0xff000000	18	.equ dc21285_high, ARMCSR_BASE & 0xff000000
@@ -43,4 +40,3 @@
43		40
44	.macro waituart,rd,rx	41	.macro waituart,rd,rx
45	.endm	42	.endm
46	#endif


diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S deleted file mode 100644 index 9dabd4bfcda2..000000000000 --- a/arch/arm/mach-gemini/include/mach/debug-macro.S +++ /dev/null
@@ -1,12 +0,0 @@
1	/*
2	* Debugging macro include header
3	*
4	* Copyright (C) 1994-1999 Russell King
5	* Copyright (C) 2001-2006 Storlink, Corp.
6	* Copyright (C) 2008-2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License version 2 as
10	* published by the Free Software Foundation.
11	*/
12	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-iop13xx/include/mach/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S deleted file mode 100644 index 90b5e64ee4ce..000000000000 --- a/arch/arm/mach-iop13xx/include/mach/debug-macro.S +++ /dev/null
@@ -1,13 +0,0 @@
1	/*
2	* arch/arm/mach-iop13xx/include/mach/debug-macro.S
3	*
4	* Debugging macro include header
5	*
6	* Copyright (C) 1994-1999 Russell King
7	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
8	*
9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License version 2 as
11	* published by the Free Software Foundation.
12	*/
13	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-iop32x/include/mach/debug-macro.S b/arch/arm/mach-iop32x/include/mach/debug-macro.S deleted file mode 100644 index 7ea745e73f5f..000000000000 --- a/arch/arm/mach-iop32x/include/mach/debug-macro.S +++ /dev/null
@@ -1,13 +0,0 @@
1	/*
2	* arch/arm/mach-iop32x/include/mach/debug-macro.S
3	*
4	* Debugging macro include header
5	*
6	* Copyright (C) 1994-1999 Russell King
7	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
8	*
9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License version 2 as
11	* published by the Free Software Foundation.
12	*/
13	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-iop33x/include/mach/debug-macro.S b/arch/arm/mach-iop33x/include/mach/debug-macro.S deleted file mode 100644 index 52781ae2f29c..000000000000 --- a/arch/arm/mach-iop33x/include/mach/debug-macro.S +++ /dev/null
@@ -1,13 +0,0 @@
1	/*
2	* arch/arm/mach-iop33x/include/mach/debug-macro.S
3	*
4	* Debugging macro include header
5	*
6	* Copyright (C) 1994-1999 Russell King
7	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
8	*
9	* This program is free software; you can redistribute it and/or modify
10	* it under the terms of the GNU General Public License version 2 as
11	* published by the Free Software Foundation.
12	*/
13	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S deleted file mode 100644 index ff706fa2f406..000000000000 --- a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S +++ /dev/null
@@ -1,12 +0,0 @@
1	/* arch/arm/mach-ixp4xx/include/mach/debug-macro.S
2	*
3	* Debugging macro include header
4	*
5	* Copyright (C) 1994-1999 Russell King
6	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License version 2 as
10	* published by the Free Software Foundation.
11	*/
12	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S deleted file mode 100644 index 011ec2526b8a..000000000000 --- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S +++ /dev/null
@@ -1,8 +0,0 @@
1	/*
2	* arch/arm/mach-kirkwood/include/mach/debug-macro.S
3	*
4	* This program is free software; you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License version 2 as
6	* published by the Free Software Foundation.
7	*/
8	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S b/arch/arm/mach-lpc32xx/include/mach/debug-macro.S deleted file mode 100644 index c7bb4bcbe2e2..000000000000 --- a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S +++ /dev/null
@@ -1,18 +0,0 @@
1	/*
2	* arch/arm/mach-lpc32xx/include/mach/debug-macro.S
3	*
4	* Author: Kevin Wells <kevin.wells@nxp.com>
5	*
6	* Copyright (C) 2010 NXP Semiconductors
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or
11	* (at your option) any later version.
12	*
13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.
17	*/
18	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S deleted file mode 100644 index c8284a2171fd..000000000000 --- a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S +++ /dev/null
@@ -1,8 +0,0 @@
1	/*
2	* arch/arm/mach-mv78xx0/include/mach/debug-macro.S
3	*
4	* This program is free software; you can redistribute it and/or modify
5	* it under the terms of the GNU General Public License version 2 as
6	* published by the Free Software Foundation.
7	*/
8	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S deleted file mode 100644 index 7489963fd8b4..000000000000 --- a/arch/arm/mach-orion5x/include/mach/debug-macro.S +++ /dev/null
@@ -1,10 +0,0 @@
1	/*
2	* arch/arm/mach-orion5x/include/mach/debug-macro.S
3	*
4	* Debugging macro include header
5	*
6	* This program is free software; you can redistribute it and/or modify
7	* it under the terms of the GNU General Public License version 2 as
8	* published by the Free Software Foundation.
9	*/
10	#include <asm/hardware/debug-8250.S>


diff --git a/arch/arm/mach-rpc/include/mach/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S deleted file mode 100644 index 88a575ebd268..000000000000 --- a/arch/arm/mach-rpc/include/mach/debug-macro.S +++ /dev/null
@@ -1,13 +0,0 @@
1	/* arch/arm/mach-rpc/include/mach/debug-macro.S
2	*
3	* Debugging macro include header
4	*
5	* Copyright (C) 1994-1999 Russell King
6	* Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
7	*
8	* This program is free software; you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License version 2 as
10	* published by the Free Software Foundation.
11	*
12	*/
13	#include <asm/hardware/debug-8250.S>