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

• Lines: 26
• Date: Thu Feb 8 16:32:44 2001
• Orig file: v2.4.1/linux/arch/arm/boot/compressed/head-sa1100.S
• Orig date: Sun Aug 13 09:54:15 2000

diff -u --recursive --new-file v2.4.1/linux/arch/arm/boot/compressed/head-sa1100.S linux/arch/arm/boot/compressed/head-sa1100.S
@@ -11,10 +11,6 @@
 #include <linux/linkage.h>
 #include <asm/mach-types.h>
 
-#ifndef CONFIG_ARCH_SA1100
-#error What am I doing here...
-#endif
-
 		.section        ".start", #alloc, #execinstr
 
 __SA1100_start:
@@ -54,6 +50,8 @@
 		bic	r0, r0, #0x0d		@ clear WB, DC, MMU
 		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.
@@ -61,3 +59,5 @@
 		mov	r0, #0x00200000
 1:		subs	r0, r0, #1
 		bne	1b
+#endif
+