diff options
| author | mmel <mmel@FreeBSD.org> | 2016-02-02 14:53:34 +0000 |
|---|---|---|
| committer | mmel <mmel@FreeBSD.org> | 2016-02-02 14:53:34 +0000 |
| commit | f6859814fe79dccdcede33e2a31616ec07fa1f28 (patch) | |
| tree | a6eba0902be3964460cc10c1b8258929c9b77790 /sys/conf | |
| parent | 08d60f77fad33862cdb65c438131e126658af325 (diff) | |
| download | FreeBSD-src-f6859814fe79dccdcede33e2a31616ec07fa1f28.zip FreeBSD-src-f6859814fe79dccdcede33e2a31616ec07fa1f28.tar.gz | |
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.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.arm | 1 | ||||
| -rw-r--r-- | sys/conf/files.arm | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index af5f7da..a7df55b 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -68,7 +68,6 @@ SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript.$M\ 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 \ diff --git a/sys/conf/files.arm b/sys/conf/files.arm index bf0e262..9f3a6bf 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -11,8 +11,7 @@ arm/arm/busdma_machdep-v6.c optional armv6 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 |
