proc-xscale.S, Kconfig:

  IXP4xx support

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 54efc6721c0fd4b4094c0990c5cd307464db4341..ba32817ad59f68b885e080d628a03a9aed3d322f 100644 (file)
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -220,7 +220,7 @@ config CPU_SA1100
 # XScale
 config CPU_XSCALE
        bool
-       depends on ARCH_IOP3XX || ARCH_ADIFCC || ARCH_PXA
+       depends on ARCH_IOP3XX || ARCH_ADIFCC || ARCH_PXA || ARCH_IXP4XX
        default y
        select CPU_32v5
        select CPU_ABRT_EV5T

diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index e23fc231ef4112a96f42ad65caf150391f1b2105..ed8b8a0f7ece722d714b1125439717dcdd9ce9f0 100644 (file)
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -647,6 +647,11 @@ cpu_pxa210_name:
        .asciz  "XScale-PXA210"
        .size   cpu_pxa210_name, . - cpu_pxa210_name
 
+       .type   cpu_ixp42x_name, #object
+cpu_ixp42x_name:
+       .asciz  "XScale-IXP42x Family"
+       .size   cpu_ixp42x_name, . - cpu_ixp42x_name
+
        .type   cpu_pxa255_name, #object
 cpu_pxa255_name:
        .asciz  "XScale-PXA255"
@@ -725,6 +730,22 @@ __pxa210_proc_info:
        .long   xscale_cache_fns
        .size   __pxa210_proc_info, . - __pxa210_proc_info
 
+       .type   __ixp42x_proc_info, #object
+__ixp42x_proc_info:
+       .long   0x690541c0
+       .long   0xffffffc0
+       .long   0x00000c0e
+       b       __xscale_setup
+       .long   cpu_arch_name
+       .long   cpu_elf_name
+       .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP
+       .long   cpu_ixp42x_name
+       .long   xscale_processor_functions
+       .long   v4wbi_tlb_fns
+       .long   xscale_mc_user_fns
+       .long   xscale_cache_fns
+       .size   __ixp42x_proc_info, . - __ixp42x_proc_info                
+
        .type   __pxa255_proc_info,#object
 __pxa255_proc_info:
        .long   0x69052d00