d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: Remove next bunch of unused cpu_functions from ARMv6.

Browse Source
This commit is contained in:
Michal Meloun 2016-10-05 12:19:09 +00:00
parent 983dea151d
commit 9567acca41
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=306704
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arm/arm/cpufunc.c
View File

@ -242,9 +242,6 @@ struct cpu_functions sheeva_cpufuncs = {
#ifdef CPU_MV_PJ4B
struct cpu_functions pj4bv7_cpufuncs = {
/* MMU functions */
.cf_control = cpufunc_control,
.cf_setttb = armv7_setttb,
/* Cache operations */
.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
@ -254,7 +251,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
/* Other functions */
.cf_drain_writebuf = armv7_drain_writebuf,
.cf_sleep = (void *)cpufunc_nullop,
/* Soft functions */
@ -418,9 +414,6 @@ struct cpu_functions fa526_cpufuncs = {
#if defined(CPU_ARM1176)
struct cpu_functions arm1176_cpufuncs = {
/* MMU functions */
.cf_control = cpufunc_control,
.cf_setttb = arm11x6_setttb,
/* Cache operations */
.cf_l2cache_wbinv_all = (void *)cpufunc_nullop,
@ -430,7 +423,6 @@ struct cpu_functions arm1176_cpufuncs = {
.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
/* Other functions */
.cf_drain_writebuf = arm11_drain_writebuf,
.cf_sleep = arm11x6_sleep,
/* Soft functions */
@ -440,9 +432,6 @@ struct cpu_functions arm1176_cpufuncs = {
#if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || defined(CPU_KRAIT)
struct cpu_functions cortexa_cpufuncs = {
/* MMU functions */
.cf_control = cpufunc_control,
.cf_setttb = armv7_setttb,
/* Cache operations */
@ -457,7 +446,6 @@ struct cpu_functions cortexa_cpufuncs = {
.cf_l2cache_drain_writebuf = (void *)cpufunc_nullop,
/* Other functions */
.cf_drain_writebuf = armv7_drain_writebuf,
.cf_sleep = armv7_cpu_sleep,
/* Soft functions */

3
sys/arm/arm/machdep.c
View File

@ -412,7 +412,7 @@ arm_vector_init(vm_offset_t va, int which)
icache_sync(va, (ARM_NVEC * 2) * sizeof(u_int));
vector_page = va;
#if __ARM_ARCH < 6
if (va == ARM_VECTORS_HIGH) {
/*
* Enable high vectors in the system control reg (SCTLR).
@ -427,6 +427,7 @@ arm_vector_init(vm_offset_t va, int which)
*/
cpu_control(CPU_CONTROL_VECRELOC, CPU_CONTROL_VECRELOC);
}
#endif
}
static void

4
sys/arm/include/cpufunc.h
View File

@ -61,14 +61,12 @@ struct cpu_functions {
/* CPU functions */
#if __ARM_ARCH < 6
void (*cf_cpwait) (void);
#endif
/* MMU functions */
u_int (*cf_control) (u_int bic, u_int eor);
void (*cf_setttb) (u_int ttb);
#if __ARM_ARCH < 6
/* TLB functions */
void (*cf_tlb_flushID) (void);
@ -150,7 +148,9 @@ struct cpu_functions {
/* Other functions */
#if __ARM_ARCH < 6
void (*cf_drain_writebuf) (void);
#endif
void (*cf_sleep) (int mode);