From 9ac81f4387e123642166fe1d4fa2a609fce67360 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sat, 30 Jul 2011 23:09:50 +0800 Subject: [PATCH] Revert "[ARM] Allow ICEDCC to work with CPU_V7 as well as CPU_V6." This reverts commit bdc8620a08c9aba3848f1bf256be4c17153efb21. --- arch/arm/boot/compressed/head.S | 2 +- arch/arm/boot/compressed/misc.c | 2 +- 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 4b2584489644..33ead1e7c9c5 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 defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7) +#ifdef CONFIG_CPU_V6 .macro loadsp, rb .endm .macro writeb, ch, rb diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index c97ad768b42c..17153b54613b 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -33,7 +33,7 @@ static void putstr(const char *ptr); #ifdef CONFIG_DEBUG_ICEDCC -#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V7) +#ifdef CONFIG_CPU_V6 static void icedcc_putc(int ch) { diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 9690ebed78fc..b121b6053cce 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) || defined(CONFIG_CPU_V7) +#if defined(CONFIG_CPU_V6) .macro addruart, rx .endm -- 2.34.1