svn commit: r368126 - in head/sys: arm/arm arm/include conf

[Michal Meloun]

Author: mmel
Date: Sat Nov 28 15:00:08 2020
New Revision: 368126
URL: https://svnweb.freebsd.org/changeset/base/368126

Log:
  Remove now unused armv4 and not-INTRNG files.

Deleted:
  head/sys/arm/arm/identcpu-v4.c
  head/sys/arm/arm/intr.c
  head/sys/arm/arm/locore-v4.S
  head/sys/arm/arm/pmap-v4.c
  head/sys/arm/arm/swtch-v4.S
  head/sys/arm/arm/trap-v4.c
  head/sys/arm/include/atomic-v4.h
  head/sys/arm/include/cpu-v4.h
  head/sys/arm/include/pmap-v4.h
  head/sys/arm/include/pte-v4.h
Modified:
  head/sys/arm/arm/cpufunc.c
  head/sys/arm/arm/locore.S
  head/sys/arm/include/atomic.h
  head/sys/arm/include/cpu.h
  head/sys/arm/include/pmap.h
  head/sys/conf/files.arm

Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c	Sat Nov 28 12:19:20 2020	(r368125)
+++ head/sys/arm/arm/cpufunc.c	Sat Nov 28 15:00:08 2020	(r368126)
@@ -256,9 +256,6 @@ struct cpu_functions cortexa_cpufuncs = {
 
 struct cpu_functions cpufuncs;
 u_int cputype;
-#if __ARM_ARCH <= 5
-u_int cpu_reset_needs_v4_MMU_disable;	/* flag used in locore-v4.s */
-#endif
 
 #if defined (CPU_ARM9E) ||	\
   defined(CPU_ARM1176) ||	\

Modified: head/sys/arm/arm/locore.S
==============================================================================
--- head/sys/arm/arm/locore.S	Sat Nov 28 12:19:20 2020	(r368125)
+++ head/sys/arm/arm/locore.S	Sat Nov 28 15:00:08 2020	(r368126)
@@ -34,8 +34,4 @@
 
 #include <machine/acle-compat.h>
 
-#if __ARM_ARCH >= 6
 #include "locore-v6.S"
-#else
-#include "locore-v4.S"
-#endif

Modified: head/sys/arm/include/atomic.h
==============================================================================
--- head/sys/arm/include/atomic.h	Sat Nov 28 12:19:20 2020	(r368125)
+++ head/sys/arm/include/atomic.h	Sat Nov 28 15:00:08 2020	(r368126)
@@ -49,11 +49,7 @@
 #include <machine/sysarch.h>
 #endif
 
-#if __ARM_ARCH >= 6
 #include <machine/atomic-v6.h>
-#else /* < armv6 */
-#include <machine/atomic-v4.h>
-#endif /* Arch >= v6 */
 
 static __inline u_long
 atomic_swap_long(volatile u_long *p, u_long v)

Modified: head/sys/arm/include/cpu.h
==============================================================================
--- head/sys/arm/include/cpu.h	Sat Nov 28 12:19:20 2020	(r368125)
+++ head/sys/arm/include/cpu.h	Sat Nov 28 15:00:08 2020	(r368126)
@@ -11,11 +11,7 @@ void	cpu_halt(void);
 void	swi_vm(void *);
 
 #ifdef _KERNEL
-#if __ARM_ARCH >= 6
 #include <machine/cpu-v6.h>
-#else
-#include <machine/cpu-v4.h>
-#endif /* __ARM_ARCH >= 6 */
 
 static __inline uint64_t
 get_cyclecount(void)

Modified: head/sys/arm/include/pmap.h
==============================================================================
--- head/sys/arm/include/pmap.h	Sat Nov 28 12:19:20 2020	(r368125)
+++ head/sys/arm/include/pmap.h	Sat Nov 28 15:00:08 2020	(r368126)
@@ -32,11 +32,7 @@
 #ifndef _MACHINE_PMAP_H_
 #define _MACHINE_PMAP_H_
 
-#if __ARM_ARCH >= 6
 #include <machine/pmap-v6.h>
-#else
-#include <machine/pmap-v4.h>
-#endif
 
 #ifdef _KERNEL
 #include <sys/systm.h>

Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm	Sat Nov 28 12:19:20 2020	(r368125)
+++ head/sys/conf/files.arm	Sat Nov 28 15:00:08 2020	(r368126)
@@ -19,7 +19,7 @@ arm/arm/cpufunc_asm_armv7.S	optional	cpu_cortexa | cpu
 arm/arm/cpufunc_asm_pj4b.S	optional	cpu_mv_pj4b
 arm/arm/cpufunc_asm_sheeva.S 	optional	cpu_arm9e
 arm/arm/cpuinfo.c		standard
-arm/arm/cpu_asm-v6.S		optional	armv7 | armv6
+arm/arm/cpu_asm-v6.S		standard
 arm/arm/db_disasm.c		optional	ddb
 arm/arm/db_interface.c		optional	ddb
 arm/arm/db_trace.c		optional	ddb
@@ -37,14 +37,12 @@ arm/arm/gdb_machdep.c		optional	gdb
 arm/arm/generic_timer.c		optional	generic_timer
 arm/arm/gic.c			optional	gic
 arm/arm/gic_fdt.c		optional	gic fdt
-arm/arm/identcpu-v4.c		optional	!armv7 !armv6
-arm/arm/identcpu-v6.c		optional	armv7 | armv6
+arm/arm/identcpu-v6.c		standard
 arm/arm/in_cksum.c		optional	inet | inet6
 arm/arm/in_cksum_arm.S		optional	inet | inet6
-arm/arm/intr.c			optional	!intrng
-kern/subr_intr.c		optional	intrng
+kern/subr_intr.c		standard
 arm/arm/locore.S		standard	no-obj
-arm/arm/hypervisor-stub.S	optional	armv7 | armv6
+arm/arm/hypervisor-stub.S	standard
 arm/arm/machdep.c		standard
 arm/arm/machdep_boot.c		standard
 arm/arm/machdep_kdb.c		standard
@@ -61,8 +59,7 @@ arm/arm/pl310.c			optional	pl310
 arm/arm/platform.c		optional	platform
 arm/arm/platform_if.m		optional	platform
 arm/arm/platform_pl310_if.m	optional	platform pl310
-arm/arm/pmap-v4.c		optional	!armv7 !armv6
-arm/arm/pmap-v6.c		optional	armv7 | armv6
+arm/arm/pmap-v6.c		standard
 arm/arm/pmu.c			optional	pmu | fdt hwpmc
 arm/arm/ptrace_machdep.c	standard
 arm/arm/sc_machdep.c		optional	sc
@@ -73,12 +70,10 @@ arm/arm/stdatomic.c		standard \
 	compile-with "${NORMAL_C:N-Wmissing-prototypes}"
 arm/arm/support.S		standard
 arm/arm/swtch.S			standard
-arm/arm/swtch-v4.S		optional	!armv7 !armv6
-arm/arm/swtch-v6.S		optional	armv7 | armv6
+arm/arm/swtch-v6.S		standard
 arm/arm/sys_machdep.c		standard
 arm/arm/syscall.c		standard
-arm/arm/trap-v4.c		optional	!armv7 !armv6
-arm/arm/trap-v6.c		optional	armv7 | armv6
+arm/arm/trap-v6.c		standard
 arm/arm/uio_machdep.c		standard
 arm/arm/undefined.c		standard
 arm/arm/unwind.c		optional	ddb | kdtrace_hooks | stack