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 1cf19a5d9c0b138bf893c5abe4bff0177a7d8ac2..4b25844896445b44c1de234d017d5d07e7056bf3 100644 (file)
--- 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