diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-08-31 01:08:21 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-09-14 10:22:01 -0400 |
| commit | fa04e4dbd3a0e68b9daf07a096db369b5a92f1bf (patch) | |
| tree | b13df3f214e3e09d92236d8857db9ea242190c22 | |
| parent | 2e9bb084e85d7c160586faf91677a0d7798f1596 (diff) | |
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.debug | 2 | ||||
| -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 | |||
| 377 | string | 377 | string |
| 378 | default "debug/icedcc.S" if DEBUG_ICEDCC | 378 | default "debug/icedcc.S" if DEBUG_ICEDCC |
| 379 | default "debug/highbank.S" if DEBUG_HIGHBANK_UART | 379 | default "debug/highbank.S" if DEBUG_HIGHBANK_UART |
| 380 | default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ | ||
| 381 | DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 | ||
| 380 | default "mach/debug-macro.S" | 382 | default "mach/debug-macro.S" |
| 381 | 383 | ||
| 382 | config EARLY_PRINTK | 384 | 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 | |||