aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2012-08-31 00:08:21 -0500
committerRob Herring <rob.herring@calxeda.com>2012-09-14 09:22:01 -0500
commitfa04e4dbd3a0e68b9daf07a096db369b5a92f1bf (patch)
treeb13df3f214e3e09d92236d8857db9ea242190c22
parent2e9bb084e85d7c160586faf91677a0d7798f1596 (diff)
downloadlinux-linaro-stable-fa04e4dbd3a0e68b9daf07a096db369b5a92f1bf.tar.gz
ARM: vexpress: move debug macros to include/debug
Move vexpress debug-macro.S over to common debug macro directory. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Cc: Pawel Moll <pawel.moll@arm.com>
-rw-r--r--arch/arm/Kconfig.debug2
-rw-r--r--arch/arm/include/debug/vexpress.S (renamed from arch/arm/mach-vexpress/include/mach/debug-macro.S)0
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index d9d8effe67f5..525d9bd35790 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -377,6 +377,8 @@ config DEBUG_LL_INCLUDE
string
default "debug/icedcc.S" if DEBUG_ICEDCC
default "debug/highbank.S" if DEBUG_HIGHBANK_UART
+ default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
+ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
default "mach/debug-macro.S"
config EARLY_PRINTK
diff --git a/arch/arm/mach-vexpress/include/mach/debug-macro.S b/arch/arm/include/debug/vexpress.S
index 9f509f55d078..9f509f55d078 100644
--- a/arch/arm/mach-vexpress/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/vexpress.S