diff options
| author | Brian Swetland <swetland@google.com> | 2009-01-26 17:15:49 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-02-14 11:25:46 -0800 |
| commit | ca4333c55419e8c2e453611598b30e54760a2001 (patch) | |
| tree | cac03c8113641f51ba9f4b37cc58902d3f56ec6a /arch/arm/boot/compressed/head.S | |
| parent | cbc3c4bdcb9c51dbf20a4949d809e0e55dcd39bc (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>
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
| -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 c5d60250d43d..38342c7c8fab 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 |