1 files changed, 16 insertions, 6 deletions

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 14a9ff9c68df..e5ab51b9cceb 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -20,11 +20,21 @@
 #ifdef DEBUG
 
 #if defined(CONFIG_DEBUG_ICEDCC)
+
+#ifdef CONFIG_CPU_V6
+                .macro  loadsp, rb
+                .endm
+                .macro  writeb, ch, rb
+                mcr     p14, 0, \ch, c0, c5, 0
+                .endm
+#else
                 .macro  loadsp, rb
                 .endm
                 .macro  writeb, ch, rb
                 mcr     p14, 0, \ch, c0, c1, 0
                 .endm
+#endif
+
 #else
 
 #include <asm/arch/debug-macro.S>
@@ -42,12 +52,6 @@
                 add     \rb, \rb, #0x00010000   @ Ser1
 #endif
                 .endm
-#elif defined(CONFIG_ARCH_IOP331)
-                .macro loadsp, rb
-                mov     \rb, #0xff000000
-                orr     \rb, \rb, #0x00ff0000
-                orr     \rb, \rb, #0x0000f700   @ location of the UART
-                .endm
 #elif defined(CONFIG_ARCH_S3C2410)
                 .macro loadsp, rb
                 mov     \rb, #0x50000000
@@ -78,9 +82,11 @@
                 kphex   r6, 8           /* processor id */
                 kputc   #':'
                 kphex   r7, 8           /* architecture id */
+#ifdef CONFIG_CPU_CP15
                 kputc   #':'
                 mrc     p15, 0, r0, c1, c0
                 kphex   r0, 8           /* control reg */
+#endif
                 kputc   #'\n'
                 kphex   r5, 8           /* decompressed kernel start */
                 kputc   #'-'
@@ -503,7 +509,11 @@ call_kernel:	bl	cache_clean_flush
  */
 
 call_cache_fn:  adr     r12, proc_types
+#ifdef CONFIG_CPU_CP15
                 mrc     p15, 0, r6, c0, c0      @ get processor ID
+#else
+                ldr     r6, =CONFIG_PROCESSOR_ID
+#endif
 1:              ldr     r1, [r12, #0]           @ get value
                 ldr     r2, [r12, #4]           @ get mask
                 eor     r1, r1, r6              @ (real ^ match)