Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2facbc88 authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c3faa9b7

arch/arm/Kconfig.debug

+2 −8
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/include/asm/hardware/debug-8250.S→arch/arm/include/debug/8250.S

+1 −5
Original line number Original line Diff line number Diff line 
/*

/*

 * 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]

arch/arm/include/debug/mvebu.S

deleted100644 → 0
+0 −13
Original line number Original line Diff line number Diff line 
/*

 * 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>

arch/arm/include/debug/nspire.S

+0 −4
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/include/debug/pxa.S

deleted100644 → 0
+0 −13
Original line number Original line Diff line number Diff line 
/*

 * 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>