From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 15:09:47 +0000 (+0800)
Subject: Revert "[ARM] avoid mis-detecting some V7 cores in the decompressor"
X-Git-Tag: firefly_0821_release~9843
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=feafc64363121ecdfc0ff01a5ecf4439fe750371;p=firefly-linux-kernel-4.4.55.git

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

This reverts commit 7725dd9abd08371ccab1025e5b7b77bd5a206e73.
---

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 1cf19a5d9c0b..4b2584489644 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -624,8 +624,6 @@ 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
@@ -634,7 +632,6 @@ proc_types:
  THUMB(		nop				)
 		mov	pc, lr
  THUMB(		nop				)
-#endif
 
 		.word	0x41007000		@ ARM7/710
 		.word	0xfff8fe00