diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2010-03-12 11:47:55 +0100 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-05-06 05:12:11 +0200 |
| commit | 4157d317dc20f12bee9944155fed399bbe38fae4 (patch) | |
| tree | 1221d6581cdb539e9ba48797d8cbaf831ce796bc /arch/arm/boot | |
| parent | [ARM] pxa/viper: fix timeout usage for I2C (diff) | |
| download | linux-4157d317dc20f12bee9944155fed399bbe38fae4.tar.xz linux-4157d317dc20f12bee9944155fed399bbe38fae4.zip | |
[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>
Diffstat (limited to 'arch/arm/boot')
| -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: W(b) __armv4_mmu_cache_off W(b) __armv4_mmu_cache_flush - .word 0x56056930 - .word 0xff0ffff0 @ PXA935 + .word 0x56056900 + .word 0xffffff00 @ PXA9xx W(b) __armv4_mmu_cache_on W(b) __armv4_mmu_cache_off W(b) __armv4_mmu_cache_flush @@ -697,12 +697,6 @@ proc_types: W(b) __armv4_mmu_cache_off W(b) __armv5tej_mmu_cache_flush - .word 0x56056930 - .word 0xff0ffff0 @ PXA935 - W(b) __armv4_mmu_cache_on - W(b) __armv4_mmu_cache_off - W(b) __armv4_mmu_cache_flush - .word 0x56050000 @ Feroceon .word 0xff0f0000 W(b) __armv4_mmu_cache_on |