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

Commit 4e218b99 authored by Russell King's avatar Russell King
Browse files

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: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarRyan Mallon <rmallon@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5c972af4

arch/arm/Kconfig.debug

+2 −10
Original line number Original line Diff line number Diff line
@@ -846,10 +846,8 @@ config DEBUG_STI_UART 
config DEBUG_LL_INCLUDE

config DEBUG_LL_INCLUDE

	string

	string

	default "debug/8250.S" if DEBUG_UART_8250

	default "debug/8250.S" if DEBUG_UART_8250

	default "debug/bcm2835.S" if DEBUG_BCM2835

	default "debug/pl01x.S" if DEBUG_UART_PL01X

	default "debug/cns3xxx.S" if DEBUG_CNS3XXX

	default "debug/exynos.S" if DEBUG_EXYNOS_UART

	default "debug/exynos.S" if DEBUG_EXYNOS_UART

	default "debug/highbank.S" if DEBUG_HIGHBANK_UART

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/icedcc.S" if DEBUG_ICEDCC

	default "debug/imx.S" if DEBUG_IMX1_UART || \

	default "debug/imx.S" if DEBUG_IMX1_UART || \

				 DEBUG_IMX25_UART || \

				 DEBUG_IMX25_UART || \
@@ -862,18 +860,12 @@ 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/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/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_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/sti.S" if DEBUG_STI_UART

	default "debug/sti.S" if DEBUG_STI_UART

	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/ux500.S" if DEBUG_UX500_UART

	default "debug/ux500.S" if DEBUG_UX500_UART

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \

	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT

		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \

		DEBUG_VEXPRESS_UART0_CRX

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "mach/debug-macro.S"

	default "mach/debug-macro.S"

arch/arm/include/debug/bcm2835.S

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

 * Debugging macro include header

 *

 * Copyright (C) 2010 Broadcom

 * 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-pl01x.S>

arch/arm/include/debug/cns3xxx.S

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

 * Debugging macro include header

 *

 * Copyright 1994-1999 Russell King

 * Copyright 2008 Cavium Networks

 * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks

 *

 * This file 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-pl01x.S>

arch/arm/include/debug/highbank.S

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

 * 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-pl01x.S>

arch/arm/include/debug/mxs.S

deleted100644 → 0
+0 −13
Original line number Original line Diff line number Diff line 
/* arch/arm/mach-mxs/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-pl01x.S>