summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-03-09 21:12:31 +0000
committerian <ian@FreeBSD.org>2014-03-09 21:12:31 +0000
commitab495f6c9b034c2f3f40db2e5c237afe71598846 (patch)
tree4bbce15618b3dff2ffc3009f48d735b611e461ac /sys/conf
parent5325036e28f5a02667b2b4d1afcc3fea08a45642 (diff)
downloadFreeBSD-src-ab495f6c9b034c2f3f40db2e5c237afe71598846.zip
FreeBSD-src-ab495f6c9b034c2f3f40db2e5c237afe71598846.tar.gz
Remove all traces of support for ARM chips prior to the arm9 series. We
never actually ran on these chips (other than using SA1 support in an emulator to do the early porting to FreeBSD long long ago). The clutter and complexity of some of this code keeps getting in the way of other maintenance, so it's time to go.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.arm6
-rw-r--r--sys/conf/files.arm4
-rw-r--r--sys/conf/options.arm2
3 files changed, 5 insertions, 7 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 95184f3..82b39f8 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -72,9 +72,9 @@ SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript.$M\
SYSTEM_LD_TAIL += ;sh ${S}/tools/embed_mfs.sh ${KERNEL_KO}.bin ${MFS_IMAGE};
.endif
-FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_arm7tdmi.S \
- $S/$M/$M/cpufunc_asm_arm8.S $S/$M/$M/cpufunc_asm_arm9.S \
- $S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \
+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 7829807..95d5bdc 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -5,7 +5,7 @@ arm/arm/bcopyinout.S standard
arm/arm/blockio.S standard
arm/arm/bootconfig.c standard
arm/arm/bus_space_asm_generic.S standard
-arm/arm/busdma_machdep.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_sa1100 | cpu_sa1110 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0
+arm/arm/busdma_machdep.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0
arm/arm/busdma_machdep-v6.c optional cpu_arm1136 | cpu_arm1176 | cpu_cortexa | cpu_mv_pj4b | cpu_krait
arm/arm/copystr.S standard
arm/arm/cpufunc.c standard
@@ -36,7 +36,7 @@ arm/arm/nexus.c standard
arm/arm/physmem.c standard
arm/arm/pl190.c optional pl190
arm/arm/pl310.c optional pl310
-arm/arm/pmap.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_sa1100 | cpu_sa1110 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0
+arm/arm/pmap.c optional cpu_arm9 | cpu_arm9e | cpu_fa526 | cpu_xscale_80219 | cpu_xscale_80321 | cpu_xscale_81342 | cpu_xscale_ixp425 | cpu_xscale_ixp435 | cpu_xscale_pxa2x0
arm/arm/pmap-v6.c optional cpu_arm1136 | cpu_arm1176 | cpu_cortexa | cpu_mv_pj4b | cpu_krait
arm/arm/sc_machdep.c optional sc
arm/arm/setcpsr.S standard
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 1080bf3..7b03ac8 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -15,8 +15,6 @@ CPU_KRAIT opt_global.h
CPU_FA526 opt_global.h
CPU_FA626TE opt_global.h
CPU_MV_PJ4B opt_global.h
-CPU_SA1100 opt_global.h
-CPU_SA1110 opt_global.h
CPU_XSCALE_80219 opt_global.h
CPU_XSCALE_80321 opt_global.h
CPU_XSCALE_81342 opt_global.h
OpenPOWER on IntegriCloud