diff options
| author | Brian Swetland <swetland@google.com> | 2009-01-26 17:15:49 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-04-09 13:53:12 -0700 |
| commit | ed275aa26f3bcde6da3356755ae5ad8eeab7444f (patch) | |
| tree | a956e58e437840e2c094b8714e7e21be559d670c | |
| parent | 8b6990fe2e8c62ac9b12c1ed9f12ffd1629c23b0 (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 5f6045f1766..1dcf1b8ce27 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -766,6 +766,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 @@ -774,6 +776,7 @@ proc_types: THUMB( nop ) mov pc, lr THUMB( nop ) +#endif .word 0x41007000 @ ARM7/710 .word 0xfff8fe00 |