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 4b25844896445b44c1de234d017d5d07e7056bf3..33ead1e7c9c5e77e6ec38c30327df00e7002d2a4 100644 (file)
--- 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 c97ad768b42c4dab7b0697c53c7fbc30f2670cfd..17153b54613b4c5948db2f66b1cbf7a0716b2309 100644 (file)
--- 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 9690ebed78fc1534475a042f687189b6aac9a971..b121b6053cce4e74a1b650c6bc83665920225ede 100644 (file)
--- 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