---

yaml --- r: 24534 b: refs/heads/master c: de4533a h: refs/heads/master v: v3
git-mirror · Mar 28, 2006 · cee6438 · cee6438
1 parent a470312
commit cee6438
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 23 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a081568d7016061ed848696984e3acf1ba0b3054
+refs/heads/master: de4533a04eb4f66dbef71f59a9c118256b886823
diff --git a/trunk/arch/arm/boot/compressed/Makefile b/trunk/arch/arm/boot/compressed/Makefile
@@ -50,10 +50,6 @@ ifeq ($(CONFIG_ARCH_AT91RM9200),y)
 OBJS		+= head-at91rm9200.o
 endif
 
-ifeq ($(CONFIG_DEBUG_ICEDCC),y)
-OBJS            += ice-dcc.o
-endif
-
 ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
 OBJS		+= big-endian.o
 endif

diff --git a/trunk/arch/arm/boot/compressed/ice-dcc.S b/trunk/arch/arm/boot/compressed/ice-dcc.S
diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c
@@ -30,7 +30,20 @@ static void putstr(const char *ptr);
 #include <asm/arch/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC
-extern void icedcc_putc(int ch);
+static void icedcc_putc(int ch)
+{
+	int status, i = 0x4000000;
+
+	do {
+		if (--i < 0)
+			return;
+
+		asm("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));
+	} while (status & 2);
+
+	asm("mcr p15, 0, %0, c1, c0, 0" : : "r" (ch));
+}
+
 #define putc(ch)	icedcc_putc(ch)
 #define flush()	do { } while (0)
 #endif