diff options
| author | Brian Swetland <swetland@google.com> | 2009-01-26 17:15:49 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:08:39 -0700 |
| commit | 180b7a0ba65bb1c60076b9f5efee22cf6b1361bf (patch) | |
| tree | 83ecac6c05f357f8480f791c795354f05f24bca5 | |
| parent | 069a03111b087dae846ac6a29c624d1a91ab47b0 (diff) | |
[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>
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index f9da41921c5..d7bfd2ee75e 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 |