diff options
| author | Brian Swetland <swetland@google.com> | 2009-01-26 17:14:04 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:04 -0700 |
| commit | 89af241e82510c01679699ceb7ec240963f029b0 (patch) | |
| tree | dcd5f1aa5eba2b151b60cdf37236155f94e2cb5d | |
| parent | 439743f09494424e5d6e3c4a2f71158815a157ea (diff) | |
[ARM] Allow ICEDCC to work with CPU_V7 as well as CPU_V6.
The mechanism is the same -- just need to adjust some ifdefs.
Signed-off-by: Brian Swetland <swetland@google.com>
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/misc.c | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/debug.S | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 6825c34646d4..1f9394378652 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -21,7 +21,7 @@ #if defined(CONFIG_DEBUG_ICEDCC) -#ifdef CONFIG_CPU_V6 +#ifdef defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7) .macro loadsp, rb, tmp .endm .macro writeb, ch, rb diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index e653a6d3c8d9..253ecc88a7bb 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -36,7 +36,7 @@ extern void error(char *x); #ifdef CONFIG_DEBUG_ICEDCC -#ifdef CONFIG_CPU_V6 +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7) static void icedcc_putc(int ch) { diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index a38b4879441d..90ecfa32a226 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -22,7 +22,7 @@ #if defined(CONFIG_DEBUG_ICEDCC) @@ debug using ARM EmbeddedICE DCC channel -#if defined(CONFIG_CPU_V6) +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7) .macro addruart, rx, tmp .endm |