diff options
author | root <root@dyn-67.arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /arch/arm/boot/compressed/head.S | |
parent | 7d83f8fca517b123cf0136503a9e50974f65ec49 (diff) | |
parent | 5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5 (diff) |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
-rw-r--r-- | arch/arm/boot/compressed/head.S | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index d1b678dc120b..d14b827adcd6 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -636,6 +636,18 @@ proc_types: | |||
636 | b __armv4_mmu_cache_off | 636 | b __armv4_mmu_cache_off |
637 | b __armv4_mmu_cache_flush | 637 | b __armv4_mmu_cache_flush |
638 | 638 | ||
639 | .word 0x56158000 @ PXA168 | ||
640 | .word 0xfffff000 | ||
641 | b __armv4_mmu_cache_on | ||
642 | b __armv4_mmu_cache_off | ||
643 | b __armv5tej_mmu_cache_flush | ||
644 | |||
645 | .word 0x56056930 | ||
646 | .word 0xff0ffff0 @ PXA935 | ||
647 | b __armv4_mmu_cache_on | ||
648 | b __armv4_mmu_cache_off | ||
649 | b __armv4_mmu_cache_flush | ||
650 | |||
639 | .word 0x56050000 @ Feroceon | 651 | .word 0x56050000 @ Feroceon |
640 | .word 0xff0f0000 | 652 | .word 0xff0f0000 |
641 | b __armv4_mmu_cache_on | 653 | b __armv4_mmu_cache_on |