diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2010-03-12 05:47:55 -0500 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-05 23:12:11 -0400 |
| commit | 4157d317dc20f12bee9944155fed399bbe38fae4 (patch) | |
| tree | 1221d6581cdb539e9ba48797d8cbaf831ce796bc | |
| parent | 6ae87fe219ce32ea226254ee72e1d38ad35d9deb (diff) | |
[ARM] pxa: update cpuid pattern for pxa9xx in head.S
Update CPUID pattern of PXA9xx in head.S and fix the duplicate
entries for pxa935.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 6ab6b337a913..c5191b1532e8 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -685,8 +685,8 @@ proc_types: | |||
| 685 | W(b) __armv4_mmu_cache_off | 685 | W(b) __armv4_mmu_cache_off |
| 686 | W(b) __armv4_mmu_cache_flush | 686 | W(b) __armv4_mmu_cache_flush |
| 687 | 687 | ||
| 688 | .word 0x56056930 | 688 | .word 0x56056900 |
| 689 | .word 0xff0ffff0 @ PXA935 | 689 | .word 0xffffff00 @ PXA9xx |
| 690 | W(b) __armv4_mmu_cache_on | 690 | W(b) __armv4_mmu_cache_on |
| 691 | W(b) __armv4_mmu_cache_off | 691 | W(b) __armv4_mmu_cache_off |
| 692 | W(b) __armv4_mmu_cache_flush | 692 | W(b) __armv4_mmu_cache_flush |
| @@ -697,12 +697,6 @@ proc_types: | |||
| 697 | W(b) __armv4_mmu_cache_off | 697 | W(b) __armv4_mmu_cache_off |
| 698 | W(b) __armv5tej_mmu_cache_flush | 698 | W(b) __armv5tej_mmu_cache_flush |
| 699 | 699 | ||
| 700 | .word 0x56056930 | ||
| 701 | .word 0xff0ffff0 @ PXA935 | ||
| 702 | W(b) __armv4_mmu_cache_on | ||
| 703 | W(b) __armv4_mmu_cache_off | ||
| 704 | W(b) __armv4_mmu_cache_flush | ||
| 705 | |||
| 706 | .word 0x56050000 @ Feroceon | 700 | .word 0x56050000 @ Feroceon |
| 707 | .word 0xff0f0000 | 701 | .word 0xff0f0000 |
| 708 | W(b) __armv4_mmu_cache_on | 702 | W(b) __armv4_mmu_cache_on |
