From 4a00364736519764a76af566be98eeeabb6fbce5 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 6 Jul 2013 23:13:15 +0100 Subject: ARM: debug: provide 8250 debug uart register shift configuration option Move the definition of the UART register shift out of the platform specific header file into the Kconfig files. Signed-off-by: Russell King --- arch/arm/mach-kirkwood/include/mach/debug-macro.S | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-kirkwood') diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S index f785d401a607..51eee02ab5e0 100644 --- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S @@ -15,5 +15,4 @@ orr \rv, \rv, #0x00012000 .endm -#define UART_SHIFT 2 #include -- cgit v1.2.1 From c3faa9b7573bf8668869c0ef3075430dc9f053c6 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 7 Jul 2013 00:01:39 +0100 Subject: ARM: debug: provide 8250 debug uart phys/virt address configuration options Move the definition of the UART register addresses out of the platform specific header file into the Kconfig files. Signed-off-by: Russell King --- arch/arm/mach-kirkwood/include/mach/debug-macro.S | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'arch/arm/mach-kirkwood') diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S index 51eee02ab5e0..011ec2526b8a 100644 --- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S +++ b/arch/arm/mach-kirkwood/include/mach/debug-macro.S @@ -5,14 +5,4 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - -#include - - .macro addruart, rp, rv, tmp - ldr \rp, =KIRKWOOD_REGS_PHYS_BASE - ldr \rv, =KIRKWOOD_REGS_VIRT_BASE - orr \rp, \rp, #0x00012000 - orr \rv, \rv, #0x00012000 - .endm - #include -- cgit v1.2.1 From 2facbc88733b34e1f992cde054c88b8e07607043 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 7 Jul 2013 00:11:35 +0100 Subject: 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 --- arch/arm/mach-kirkwood/include/mach/debug-macro.S | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 arch/arm/mach-kirkwood/include/mach/debug-macro.S (limited to 'arch/arm/mach-kirkwood') 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 -- cgit v1.2.1