vserver 1.9.3

[linux-2.6.git] / arch / arm / boot / compressed / head-xscale.S

diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S
index f919449..637e637 100644 (file)
--- a/arch/arm/boot/compressed/head-xscale.S
+++ b/arch/arm/boot/compressed/head-xscale.S
@@ -35,11 +35,19 @@ __XScale_start:
                mcr     p15, 0, r0, c1, c0, 0
 
 #ifdef CONFIG_ARCH_IQ80321
-               orr     pc, pc, #PHYS_OFFSET    @ jump to physical memory if we are not there.
-               nop
                mov     r7, #MACH_TYPE_IQ80321
 #endif
 
+#ifdef  CONFIG_ARCH_IQ31244
+               mov     r7, #(MACH_TYPE_IQ31244 & 0xff)
+               orr     r7, r7, #(MACH_TYPE_IQ31244 & 0xff00)
+#endif
+
+#ifdef  CONFIG_ARCH_IQ80331
+               mov     r7, #(MACH_TYPE_IQ80331 & 0xff)
+               orr     r7, r7, #(MACH_TYPE_IQ80331 & 0xff00)
+#endif
+
 #ifdef CONFIG_ARCH_LUBBOCK
                mov     r7, #MACH_TYPE_LUBBOCK
 #endif
@@ -48,22 +56,3 @@ __XScale_start:
                mov     r7, #MACH_TYPE_COTULLA_IDP
 #endif
 
-#ifdef CONFIG_ARCH_IQ80310
-               /*
-                * Crank the CPU up to 733MHz
-                */
-               mov     r1, #9
-               mcr     p14, 0, r1, c6, c0, 0
-
-               /*
-                * Disable ECC error notification
-                * At some point, we should add an ECC handler to Linux
-                */
-               mov     r1, #0x1500
-               mov     r0, #0x4
-               str     r0, [r1, #0x34]
-
-               mov     r7, #MACH_TYPE_IQ80310
-#endif
-
-