diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-11-29 08:42:39 -0500 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2008-12-02 01:42:40 -0500 |
commit | 59c7bcd4d60812ca10ec691376f43d6a5fbfb4f8 (patch) | |
tree | 74ebe42f17a16018dbbafb0ae7e7ad18f185e4fe | |
parent | f1c6cd62cc4f7e55a803c4b9b92a67488d765a8f (diff) |
[ARM] pxa: add base PXA935 support due to CPUID change
PXA935 has changed its implementor ID from Intel to Marvell, this
patch modifies arch/arm/boot/compressed/head.S and proc-xsc3.S to
support a smooth bootup.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
-rw-r--r-- | arch/arm/boot/compressed/head.S | 6 | ||||
-rw-r--r-- | arch/arm/mm/proc-xsc3.S | 25 |
2 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 84a1e0496a3c..606650964eff 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -624,6 +624,12 @@ proc_types: | |||
624 | b __armv4_mmu_cache_off | 624 | b __armv4_mmu_cache_off |
625 | b __armv4_mmu_cache_flush | 625 | b __armv4_mmu_cache_flush |
626 | 626 | ||
627 | .word 0x56056930 | ||
628 | .word 0xff0ffff0 @ PXA935 | ||
629 | b __armv4_mmu_cache_on | ||
630 | b __armv4_mmu_cache_off | ||
631 | b __armv4_mmu_cache_flush | ||
632 | |||
627 | .word 0x56050000 @ Feroceon | 633 | .word 0x56050000 @ Feroceon |
628 | .word 0xff0f0000 | 634 | .word 0xff0f0000 |
629 | b __armv4_mmu_cache_on | 635 | b __armv4_mmu_cache_on |
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index 8f6cf56c11c0..33515c214b92 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
@@ -481,3 +481,28 @@ __xsc3_proc_info: | |||
481 | .long xsc3_mc_user_fns | 481 | .long xsc3_mc_user_fns |
482 | .long xsc3_cache_fns | 482 | .long xsc3_cache_fns |
483 | .size __xsc3_proc_info, . - __xsc3_proc_info | 483 | .size __xsc3_proc_info, . - __xsc3_proc_info |
484 | |||
485 | /* Note: PXA935 changed its implementor ID from Intel to Marvell */ | ||
486 | |||
487 | .type __xsc3_pxa935_proc_info,#object | ||
488 | __xsc3_pxa935_proc_info: | ||
489 | .long 0x56056000 | ||
490 | .long 0xffffe000 | ||
491 | .long PMD_TYPE_SECT | \ | ||
492 | PMD_SECT_BUFFERABLE | \ | ||
493 | PMD_SECT_CACHEABLE | \ | ||
494 | PMD_SECT_AP_WRITE | \ | ||
495 | PMD_SECT_AP_READ | ||
496 | .long PMD_TYPE_SECT | \ | ||
497 | PMD_SECT_AP_WRITE | \ | ||
498 | PMD_SECT_AP_READ | ||
499 | b __xsc3_setup | ||
500 | .long cpu_arch_name | ||
501 | .long cpu_elf_name | ||
502 | .long HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP | ||
503 | .long cpu_xsc3_name | ||
504 | .long xsc3_processor_functions | ||
505 | .long v4wbi_tlb_fns | ||
506 | .long xsc3_mc_user_fns | ||
507 | .long xsc3_cache_fns | ||
508 | .size __xsc3_pxa935_proc_info, . - __xsc3_pxa935_proc_info | ||