mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 14:42:24 +00:00
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>
This commit is contained in:
Russell King
parent
c3faa9b757
commit
2facbc8873
@ -830,6 +830,7 @@ config DEBUG_STI_UART
|
|||||||
|
|
||||||
config DEBUG_LL_INCLUDE
|
config DEBUG_LL_INCLUDE
|
||||||
string
|
string
|
||||||
|
default "debug/8250.S" if DEBUG_UART_8250
|
||||||
default "debug/bcm2835.S" if DEBUG_BCM2835
|
default "debug/bcm2835.S" if DEBUG_BCM2835
|
||||||
default "debug/cns3xxx.S" if DEBUG_CNS3XXX
|
default "debug/cns3xxx.S" if DEBUG_CNS3XXX
|
||||||
default "debug/exynos.S" if DEBUG_EXYNOS_UART
|
default "debug/exynos.S" if DEBUG_EXYNOS_UART
|
||||||
@ -846,21 +847,14 @@ config DEBUG_LL_INCLUDE
|
|||||||
DEBUG_IMX6SL_UART
|
DEBUG_IMX6SL_UART
|
||||||
default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
|
default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
|
||||||
DEBUG_KEYSTONE_UART1
|
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/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
|
||||||
default "debug/nomadik.S" if DEBUG_NOMADIK_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/omap2plus.S" if DEBUG_OMAP2PLUS_UART
|
||||||
default "debug/picoxcell.S" if DEBUG_PICOXCELL_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/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
|
||||||
default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
|
default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
|
||||||
default "debug/sti.S" if DEBUG_STI_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/tegra.S" if DEBUG_TEGRA_UART
|
||||||
default "debug/u300.S" if DEBUG_U300_UART
|
default "debug/u300.S" if DEBUG_U300_UART
|
||||||
default "debug/ux500.S" if DEBUG_UX500_UART
|
default "debug/ux500.S" if DEBUG_UX500_UART
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* arch/arm/include/asm/hardware/debug-8250.S
|
* arch/arm/include/debug/8250.S
|
||||||
*
|
*
|
||||||
* Copyright (C) 1994-2013 Russell King
|
* Copyright (C) 1994-2013 Russell King
|
||||||
*
|
*
|
||||||
@ -9,16 +9,12 @@
|
|||||||
*/
|
*/
|
||||||
#include <linux/serial_reg.h>
|
#include <linux/serial_reg.h>
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_UART_PHYS
|
|
||||||
.macro addruart, rp, rv, tmp
|
.macro addruart, rp, rv, tmp
|
||||||
ldr \rp, =CONFIG_DEBUG_UART_PHYS
|
ldr \rp, =CONFIG_DEBUG_UART_PHYS
|
||||||
ldr \rv, =CONFIG_DEBUG_UART_VIRT
|
ldr \rv, =CONFIG_DEBUG_UART_VIRT
|
||||||
.endm
|
.endm
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef UART_SHIFT
|
|
||||||
#define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT
|
#define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT
|
||||||
#endif
|
|
||||||
|
|
||||||
.macro senduart,rd,rx
|
.macro senduart,rd,rx
|
||||||
strb \rd, [\rx, #UART_TX << UART_SHIFT]
|
strb \rd, [\rx, #UART_TX << UART_SHIFT]
|
||||||
@ -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>
|
|
||||||
@ -19,7 +19,3 @@
|
|||||||
|
|
||||||
#include <asm/hardware/debug-pl01x.S>
|
#include <asm/hardware/debug-pl01x.S>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART
|
|
||||||
#include <asm/hardware/debug-8250.S>
|
|
||||||
#endif
|
|
||||||
|
|||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -13,9 +13,6 @@
|
|||||||
|
|
||||||
#include <asm/hardware/dec21285.h>
|
#include <asm/hardware/dec21285.h>
|
||||||
|
|
||||||
#ifndef CONFIG_DEBUG_DC21285_PORT
|
|
||||||
#include <asm/hardware/debug-8250.S>
|
|
||||||
#else
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
/* For EBSA285 debugging */
|
/* For EBSA285 debugging */
|
||||||
.equ dc21285_high, ARMCSR_BASE & 0xff000000
|
.equ dc21285_high, ARMCSR_BASE & 0xff000000
|
||||||
@ -43,4 +40,3 @@
|
|||||||
|
|
||||||
.macro waituart,rd,rx
|
.macro waituart,rd,rx
|
||||||
.endm
|
.endm
|
||||||
#endif
|
|
||||||
|
|||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
@ -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>
|
|
||||||
Loading…
Reference in New Issue
Block a user