From: Brian Swetland <swetland@google.com>
Date: Tue, 27 Jan 2009 01:14:04 +0000 (-0800)
Subject: [ARM] Allow ICEDCC to work with CPU_V7 as well as CPU_V6.
X-Git-Tag: firefly_0821_release~11783
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bdc8620a08c9aba3848f1bf256be4c17153efb21;p=firefly-linux-kernel-4.4.55.git

[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>
---

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index fa6fbf45cf3b..2a998920dfc0 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
 		.endm
 		.macro	writeb, ch, rb
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 17153b54613b..c97ad768b42c 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
 
-#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 b121b6053cce..9690ebed78fc 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
 		.endm