diff options
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 4d1f07d5fa9..caddb9d35b7 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -657,6 +657,8 @@ proc_types: | |||
657 | @ b __arm6_mmu_cache_off | 657 | @ b __arm6_mmu_cache_off |
658 | @ b __armv3_mmu_cache_flush | 658 | @ b __armv3_mmu_cache_flush |
659 | 659 | ||
660 | #if !defined(CONFIG_CPU_V7) | ||
661 | /* This collides with some V7 IDs, preventing correct detection */ | ||
660 | .word 0x00000000 @ old ARM ID | 662 | .word 0x00000000 @ old ARM ID |
661 | .word 0x0000f000 | 663 | .word 0x0000f000 |
662 | mov pc, lr | 664 | mov pc, lr |
@@ -665,6 +667,7 @@ proc_types: | |||
665 | THUMB( nop ) | 667 | THUMB( nop ) |
666 | mov pc, lr | 668 | mov pc, lr |
667 | THUMB( nop ) | 669 | THUMB( nop ) |
670 | #endif | ||
668 | 671 | ||
669 | .word 0x41007000 @ ARM7/710 | 672 | .word 0x41007000 @ ARM7/710 |
670 | .word 0xfff8fe00 | 673 | .word 0xfff8fe00 |