From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 15:09:50 +0000 (+0800)
Subject: Revert "[ARM] Allow ICEDCC to work with CPU_V7 as well as CPU_V6."
X-Git-Tag: firefly_0821_release~9842
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9ac81f4387e123642166fe1d4fa2a609fce67360;p=firefly-linux-kernel-4.4.55.git

Revert "[ARM] Allow ICEDCC to work with CPU_V7 as well as CPU_V6."

This reverts commit bdc8620a08c9aba3848f1bf256be4c17153efb21.
---

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