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~9833^2~5^2~359
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=89af241e82510c01679699ceb7ec240963f029b0;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 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