Author: andrew
Date: Sat Jul 28 11:00:45 2018
New Revision: 336813
URL: https://svnweb.freebsd.org/changeset/base/336813
Log:
Remove now the cow unused CPU_ARM9 and CPU_FA526 options. These are for
ARMv4 CPUs that are no longer supported.
Deleted:
head/sys/arm/arm/cpufunc_asm_fa526.S
head/sys/arm/arm/cpufunc_asm_xscale.S
head/sys/arm/arm/cpufunc_asm_xscale_c3.S
Modified:
head/sys/arm/conf/NOTES
head/sys/conf/Makefile.arm
head/sys/conf/files.arm
head/sys/conf/options.arm
Modified: head/sys/arm/conf/NOTES
==============================================================================
--- head/sys/arm/conf/NOTES Sat Jul 28 11:00:21 2018 (r336812)
+++ head/sys/arm/conf/NOTES Sat Jul 28 11:00:45 2018 (r336813)
@@ -2,9 +2,7 @@
machine arm
-cpu CPU_ARM9
cpu CPU_ARM9E
-cpu CPU_FA526
files "../mv/files.mv"
files "../mv/discovery/files.db78xxx"
Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm Sat Jul 28 11:00:21 2018 (r336812)
+++ head/sys/conf/Makefile.arm Sat Jul 28 11:00:45 2018 (r336813)
@@ -74,9 +74,9 @@ SYSTEM_LD_TAIL +=;sed s/" + SIZEOF_HEADERS"// ldscript
FILES_CPU_FUNC = \
$S/$M/$M/cpufunc_asm_arm9.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
+ $S/$M/$M/cpufunc_asm.S \
+ $S/$M/$M/cpufunc_asm_armv5_ec.S \
+ $S/$M/$M/cpufunc_asm_sheeva.S
.if ${MACHINE_ARCH:Marmv[67]*} == "" && defined(KERNPHYSADDR)
KERNEL_EXTRA=trampoline
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Sat Jul 28 11:00:21 2018 (r336812)
+++ head/sys/conf/files.arm Sat Jul 28 11:00:45 2018 (r336813)
@@ -30,16 +30,13 @@ arm/arm/busdma_machdep-v6.c optional armv7 |
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 | cpu_arm9e
+arm/arm/cpufunc_asm_arm9.S optional cpu_arm9e
arm/arm/cpufunc_asm_arm11x6.S optional cpu_arm1176
-arm/arm/cpufunc_asm_armv4.S optional cpu_arm9 | cpu_arm9e |
cpu_fa526 | cpu_xscale_pxa2x0 | cpu_xscale_81342
+arm/arm/cpufunc_asm_armv4.S optional cpu_arm9e
arm/arm/cpufunc_asm_armv5_ec.S optional cpu_arm9e
arm/arm/cpufunc_asm_armv7.S optional cpu_cortexa | cpu_krait |
cpu_mv_pj4b
-arm/arm/cpufunc_asm_fa526.S optional cpu_fa526
arm/arm/cpufunc_asm_pj4b.S optional cpu_mv_pj4b
arm/arm/cpufunc_asm_sheeva.S optional cpu_arm9e
-arm/arm/cpufunc_asm_xscale.S optional cpu_xscale_pxa2x0 |
cpu_xscale_81342
-arm/arm/cpufunc_asm_xscale_c3.S optional cpu_xscale_81342
arm/arm/cpuinfo.c standard
arm/arm/cpu_asm-v6.S optional armv7 | armv6
arm/arm/db_disasm.c optional ddb
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Sat Jul 28 11:00:21 2018 (r336812)
+++ head/sys/conf/options.arm Sat Jul 28 11:00:45 2018 (r336813)
@@ -9,12 +9,10 @@ ARM_USE_V6_BUSDMA opt_global.h
ARM_WANT_TP_ADDRESS opt_global.h
COUNTS_PER_SEC opt_timer.h
CPSW_ETHERSWITCH opt_cpsw.h
-CPU_ARM9 opt_global.h
CPU_ARM9E opt_global.h
CPU_ARM1176 opt_global.h
CPU_CORTEXA opt_global.h
CPU_KRAIT opt_global.h
-CPU_FA526 opt_global.h
CPU_MV_PJ4B opt_global.h
SMP_ON_UP opt_global.h # Runtime detection of MP extensions
DEV_GIC opt_global.h
_______________________________________________
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"
