Author: mmel
Date: Tue Feb 2 14:53:34 2016
New Revision: 295149
URL: https://svnweb.freebsd.org/changeset/base/295149
Log:
ARM: All remaining functions in cpufunc_asm_arm10.S are identical with
functions in cpufunc_asm_arm9.S. Use arm9 variants and remove
cpufunc_asm_arm10.S completly.
Deleted:
head/sys/arm/arm/cpufunc_asm_arm10.S
Modified:
head/sys/arm/arm/cpufunc.c
head/sys/arm/include/cpufunc.h
head/sys/conf/Makefile.arm
head/sys/conf/files.arm
Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c Tue Feb 2 14:16:07 2016 (r295148)
+++ head/sys/arm/arm/cpufunc.c Tue Feb 2 14:53:34 2016 (r295149)
@@ -167,7 +167,7 @@ struct cpu_functions armv5_ec_cpufuncs =
/* TLB functions */
armv4_tlb_flushID, /* tlb_flushID */
- arm10_tlb_flushID_SE, /* tlb_flushID_SE */
+ arm9_tlb_flushID_SE, /* tlb_flushID_SE */
armv4_tlb_flushD, /* tlb_flushD */
armv4_tlb_flushD_SE, /* tlb_flushD_SE */
@@ -199,7 +199,7 @@ struct cpu_functions armv5_ec_cpufuncs =
/* Soft functions */
- arm10_context_switch, /* context_switch */
+ arm9_context_switch, /* context_switch */
arm10_setup /* cpu setup */
@@ -218,7 +218,7 @@ struct cpu_functions sheeva_cpufuncs = {
/* TLB functions */
armv4_tlb_flushID, /* tlb_flushID */
- arm10_tlb_flushID_SE, /* tlb_flushID_SE */
+ arm9_tlb_flushID_SE, /* tlb_flushID_SE */
armv4_tlb_flushD, /* tlb_flushD */
armv4_tlb_flushD_SE, /* tlb_flushD_SE */
@@ -250,7 +250,7 @@ struct cpu_functions sheeva_cpufuncs = {
/* Soft functions */
- arm10_context_switch, /* context_switch */
+ arm9_context_switch, /* context_switch */
arm10_setup /* cpu setup */
};
Modified: head/sys/arm/include/cpufunc.h
==============================================================================
--- head/sys/arm/include/cpufunc.h Tue Feb 2 14:16:07 2016
(r295148)
+++ head/sys/arm/include/cpufunc.h Tue Feb 2 14:53:34 2016
(r295149)
@@ -225,11 +225,13 @@ void fa526_idcache_wbinv_range(vm_offset
#endif
-#ifdef CPU_ARM9
+#if defined(CPU_ARM9) || defined(CPU_ARM9E)
void arm9_setttb (u_int);
-
void arm9_tlb_flushID_SE (u_int va);
+void arm9_context_switch (void);
+#endif
+#if defined(CPU_ARM9)
void arm9_icache_sync_all (void);
void arm9_icache_sync_range (vm_offset_t, vm_size_t);
@@ -241,8 +243,6 @@ void arm9_dcache_wb_range (vm_offset_t,
void arm9_idcache_wbinv_all (void);
void arm9_idcache_wbinv_range (vm_offset_t, vm_size_t);
-void arm9_context_switch (void);
-
void arm9_setup (void);
extern unsigned arm9_dcache_sets_max;
@@ -252,10 +252,6 @@ extern unsigned arm9_dcache_index_inc;
#endif
#if defined(CPU_ARM9E)
-void arm10_tlb_flushID_SE (u_int);
-
-void arm10_context_switch (void);
-
void arm10_setup (void);
u_int sheeva_control_ext (u_int, u_int);
Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm Tue Feb 2 14:16:07 2016 (r295148)
+++ head/sys/conf/Makefile.arm Tue Feb 2 14:53:34 2016 (r295149)
@@ -68,7 +68,6 @@ SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADE
FILES_CPU_FUNC = \
$S/$M/$M/cpufunc_asm_arm9.S \
- $S/$M/$M/cpufunc_asm_arm10.S \
$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
$S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \
$S/$M/$M/cpufunc_asm_fa526.S $S/$M/$M/cpufunc_asm_sheeva.S \
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Tue Feb 2 14:16:07 2016 (r295148)
+++ head/sys/conf/files.arm Tue Feb 2 14:53:34 2016 (r295149)
@@ -11,8 +11,7 @@ arm/arm/busdma_machdep-v6.c optional ar
arm/arm/copystr.S standard
arm/arm/cpufunc.c standard
arm/arm/cpufunc_asm.S standard
-arm/arm/cpufunc_asm_arm9.S optional cpu_arm9
-arm/arm/cpufunc_asm_arm10.S optional cpu_arm9e
+arm/arm/cpufunc_asm_arm9.S optional cpu_arm9 | cpu_arm9e
arm/arm/cpufunc_asm_arm11.S optional cpu_arm1176
arm/arm/cpufunc_asm_arm11x6.S optional cpu_arm1176
arm/arm/cpufunc_asm_armv4.S optional cpu_arm9 | cpu_arm9e |
cpu_fa526 | cpu_xscale_80321 | cpu_xscale_pxa2x0 | cpu_xscale_ixp425 |
cpu_xscale_80219 | cpu_xscale_81342
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
