From owner-svn-src-head@freebsd.org Sat Nov 28 15:00:10 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3A5B4A330C; Sat, 28 Nov 2020 15:00:10 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjvmp59x8z3vVn; Sat, 28 Nov 2020 15:00:10 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4C1D2935E; Sat, 28 Nov 2020 15:00:10 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ASF0ACE006676; Sat, 28 Nov 2020 15:00:10 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ASF09oD006670; Sat, 28 Nov 2020 15:00:09 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <202011281500.0ASF09oD006670@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Sat, 28 Nov 2020 15:00:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368126 - in head/sys: arm/arm arm/include conf X-SVN-Group: head X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: in head/sys: arm/arm arm/include conf X-SVN-Commit-Revision: 368126 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Nov 2020 15:00:10 -0000 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 -#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 #endif -#if __ARM_ARCH >= 6 #include -#else /* < armv6 */ -#include -#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 -#else -#include -#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 -#else -#include -#endif #ifdef _KERNEL #include 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