diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-17 22:00:57 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-02-17 22:00:57 +0400 |
| commit | 8393ea14076dbda27010fcabcff5e2d40f0bfb1f (patch) | |
| tree | a980405258207f6a0d0edfc78ae07fb652bf54e1 /arch/arm/boot | |
| parent | 49561d58a14351d136518f25bd686f9a6ca41b69 (diff) | |
| parent | 1a20977eb1ba05d3e1a20f1e81a830a876fdb054 (diff) | |
Merge branch 'linaro-android-3.3-agreen-rebase' into linaro-android
Diffstat (limited to 'arch/arm/boot')
| -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 c5d60250d43..38342c7c8fa 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 |