Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Now that the PL01X debug include can mostly 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.

The autodetect case for Versatile Express and the ux500 are left alone;
these are more complicated implementations.

Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

+5 -142
+2 -10
arch/arm/Kconfig.debug
··· 846 846 config DEBUG_LL_INCLUDE 847 847 string 848 848 default "debug/8250.S" if DEBUG_UART_8250 849 - default "debug/bcm2835.S" if DEBUG_BCM2835 850 - default "debug/cns3xxx.S" if DEBUG_CNS3XXX 849 + default "debug/pl01x.S" if DEBUG_UART_PL01X 851 850 default "debug/exynos.S" if DEBUG_EXYNOS_UART 852 - default "debug/highbank.S" if DEBUG_HIGHBANK_UART 853 851 default "debug/icedcc.S" if DEBUG_ICEDCC 854 852 default "debug/imx.S" if DEBUG_IMX1_UART || \ 855 853 DEBUG_IMX25_UART || \ ··· 860 862 DEBUG_IMX6SL_UART 861 863 default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \ 862 864 DEBUG_KEYSTONE_UART1 863 - default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART 864 - default "debug/nomadik.S" if DEBUG_NOMADIK_UART 865 - default "debug/nspire.S" if DEBUG_NSPIRE_CX_UART 866 865 default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART 867 866 default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 868 867 default "debug/sti.S" if DEBUG_STI_UART 869 868 default "debug/tegra.S" if DEBUG_TEGRA_UART 870 - default "debug/u300.S" if DEBUG_U300_UART 871 869 default "debug/ux500.S" if DEBUG_UX500_UART 872 - default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ 873 - DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \ 874 - DEBUG_VEXPRESS_UART0_CRX 870 + default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT 875 871 default "debug/vt8500.S" if DEBUG_VT8500_UART0 876 872 default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 877 873 default "mach/debug-macro.S"
+1 -1
arch/arm/include/asm/hardware/debug-pl01x.S arch/arm/include/debug/pl01x.S
··· 1 - /* arch/arm/include/asm/hardware/debug-pl01x.S 1 + /* arch/arm/include/debug/pl01x.S 2 2 * 3 3 * Debugging macro include header 4 4 *
-13
arch/arm/include/debug/bcm2835.S
··· 1 - /* 2 - * Debugging macro include header 3 - * 4 - * Copyright (C) 2010 Broadcom 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-pl01x.S>
-12
arch/arm/include/debug/cns3xxx.S
··· 1 - /* 2 - * Debugging macro include header 3 - * 4 - * Copyright 1994-1999 Russell King 5 - * Copyright 2008 Cavium Networks 6 - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks 7 - * 8 - * This file 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-pl01x.S>
-11
arch/arm/include/debug/highbank.S
··· 1 - /* 2 - * Debugging macro include header 3 - * 4 - * Copyright (C) 1994-1999 Russell King 5 - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 - */ 11 - #include <asm/hardware/debug-pl01x.S>
-13
arch/arm/include/debug/mxs.S
··· 1 - /* arch/arm/mach-mxs/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-pl01x.S>
-12
arch/arm/include/debug/nomadik.S
··· 1 - /* 2 - * Debugging macro include header 3 - * 4 - * Copyright (C) 1994-1999 Russell King 5 - * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License version 2 as 9 - * published by the Free Software Foundation. 10 - * 11 - */ 12 - #include <asm/hardware/debug-pl01x.S>
-11
arch/arm/include/debug/nspire.S
··· 1 - /* 2 - * linux/arch/arm/include/debug/nspire.S 3 - * 4 - * Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au> 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 - */ 11 - #include <asm/hardware/debug-pl01x.S>
-7
arch/arm/include/debug/u300.S
··· 1 - /* 2 - * Copyright (C) 2006-2013 ST-Ericsson AB 3 - * License terms: GNU General Public License (GPL) version 2 4 - * Debugging macro include header. 5 - * Author: Linus Walleij <linus.walleij@stericsson.com> 6 - */ 7 - #include <asm/hardware/debug-pl01x.S>
+1 -1
arch/arm/include/debug/ux500.S
··· 45 45 ldr \rv, =UART_VIRT_BASE @ yes, virtual address 46 46 .endm 47 47 48 - #include <asm/hardware/debug-pl01x.S> 48 + #include <debug/pl01x.S>
+1 -1
arch/arm/include/debug/vexpress.S
··· 47 47 48 48 .endm 49 49 50 - #include <asm/hardware/debug-pl01x.S> 50 + #include <debug/pl01x.S> 51 51 #endif
-12
arch/arm/mach-ep93xx/include/mach/debug-macro.S
··· 1 - /* 2 - * arch/arm/mach-ep93xx/include/mach/debug-macro.S 3 - * Debugging macro include header 4 - * 5 - * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org> 6 - * 7 - * This program is free software; you can redistribute it and/or modify 8 - * it under the terms of the GNU General Public License as published by 9 - * the Free Software Foundation; either version 2 of the License, or (at 10 - * your option) any later version. 11 - */ 12 - #include <asm/hardware/debug-pl01x.S>
-13
arch/arm/mach-integrator/include/mach/debug-macro.S
··· 1 - /* arch/arm/mach-integrator/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-pl01x.S>
-12
arch/arm/mach-realview/include/mach/debug-macro.S
··· 1 - /* arch/arm/mach-realview/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-pl01x.S>
-13
arch/arm/mach-versatile/include/mach/debug-macro.S
··· 1 - /* arch/arm/mach-versatile/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-pl01x.S>