patch-2.4.13 linux/arch/arm/boot/compressed/head-sa1100.S

• Lines: 39
• Date: Thu Oct 11 09:04:57 2001
• Orig file: v2.4.12/linux/arch/arm/boot/compressed/head-sa1100.S
• Orig date: Thu Feb 8 16:32:44 2001

diff -u --recursive --new-file v2.4.12/linux/arch/arm/boot/compressed/head-sa1100.S linux/arch/arm/boot/compressed/head-sa1100.S
@@ -17,6 +17,24 @@
 
 		@ Preserve r8/r7 i.e. kernel entry values
 
+#if defined(CONFIG_SA1100_GRAPHICSCLIENT) && !defined(CONFIG_ANGELBOOT)
+		mov	r7, #MACH_TYPE_GRAPHICSCLIENT
+		mov	r8, #0
+#endif
+#if defined(CONFIG_SA1100_GRAPHICSMASTER) && !defined(CONFIG_ANGELBOOT)
+		mov	r7, #MACH_TYPE_GRAPHICSMASTER
+		mov	r8, #0
+#endif
+#if defined(CONFIG_SA1100_ADSBITSY) && !defined(CONFIG_ANGELBOOT)
+		mov	r7, #MACH_TYPE_ADSBITSY
+		mov	r8, #0
+#endif
+
+#ifdef CONFIG_SA1100_PFS168
+		@ REVISIT_PFS168: Temporary until firmware updated to use assigned machine number
+		mov	r7, #MACH_TYPE_PFS168
+#endif
+
 #ifdef CONFIG_SA1100_VICTOR
 		teq	r7, #MACH_TYPE_VICTOR
 		bne	10f
@@ -51,7 +69,6 @@
 		bic	r0, r0, #0x1000		@ clear Icache
 		mcr	p15, 0, r0, c1, c0, 0
 
-#ifdef CONFIG_ANGELBOOT
 /*
  * Pause for a short time so that we give enough time
  * for the host to start a terminal up.
@@ -59,5 +76,4 @@
 		mov	r0, #0x00200000
 1:		subs	r0, r0, #1
 		bne	1b
-#endif