From: Brian Swetland <swetland@google.com>
Date: Tue, 27 Jan 2009 01:15:49 +0000 (-0800)
Subject: [ARM] avoid mis-detecting some V7 cores in the decompressor
X-Git-Tag: firefly_0821_release~7613^2~899
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=180b7a0ba65bb1c60076b9f5efee22cf6b1361bf;p=firefly-linux-kernel-4.4.55.git

[ARM] avoid mis-detecting some V7 cores in the decompressor

This allows kernel decompress to happen nearly instantly instead
of taking over 20 seconds.

Signed-off-by: Brian Swetland <swetland@google.com>
---

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index f9da41921c52..d7bfd2ee75e0 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -654,6 +654,8 @@ proc_types:
 @		b	__arm6_mmu_cache_off
 @		b	__armv3_mmu_cache_flush
 
+#if !defined(CONFIG_CPU_V7)
+		/* This collides with some V7 IDs, preventing correct detection */
 		.word	0x00000000		@ old ARM ID
 		.word	0x0000f000
 		mov	pc, lr
@@ -662,6 +664,7 @@ proc_types:
  THUMB(		nop				)
 		mov	pc, lr
  THUMB(		nop				)
+#endif
 
 		.word	0x41007000		@ ARM7/710
 		.word	0xfff8fe00