Date: Mon, 16 Jan 2017 16:44:13 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r312292 - in head/sys/arm: arm include Message-ID: <201701161644.v0GGiDcU045297@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Mon Jan 16 16:44:13 2017 New Revision: 312292 URL: https://svnweb.freebsd.org/changeset/base/312292 Log: Remove arm's cpuconf.h, and references to it, after moving a few lines from it into pmap-v4.h where they are used. Other than those few lines of support for different MMU types, nothing in cpuconf.h has been used in our code for quite a while. The file existed to set up a variety of symbols to describe the architecture. Over the past few years we have converted all of our source to use the new architecture symbols standardized by ARM Inc, and predefined by both clang and gcc. PR: 216104 Deleted: head/sys/arm/include/cpuconf.h Modified: head/sys/arm/arm/bus_space_asm_generic.S head/sys/arm/arm/cpufunc.c head/sys/arm/arm/identcpu-v4.c head/sys/arm/arm/locore-v4.S head/sys/arm/arm/locore-v6.S head/sys/arm/include/atomic.h head/sys/arm/include/cpufunc.h head/sys/arm/include/pcpu.h head/sys/arm/include/pmap-v4.h Modified: head/sys/arm/arm/bus_space_asm_generic.S ============================================================================== --- head/sys/arm/arm/bus_space_asm_generic.S Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/arm/bus_space_asm_generic.S Mon Jan 16 16:44:13 2017 (r312292) @@ -36,7 +36,6 @@ */ #include <machine/asm.h> -#include <machine/cpuconf.h> __FBSDID("$FreeBSD$"); /* Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/arm/cpufunc.c Mon Jan 16 16:44:13 2017 (r312292) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <vm/uma.h> -#include <machine/cpuconf.h> #include <machine/cpufunc.h> #if defined(CPU_XSCALE_81342) Modified: head/sys/arm/arm/identcpu-v4.c ============================================================================== --- head/sys/arm/arm/identcpu-v4.c Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/arm/identcpu-v4.c Mon Jan 16 16:44:13 2017 (r312292) @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/endian.h> -#include <machine/cpuconf.h> #include <machine/md_var.h> char machine[] = "arm"; Modified: head/sys/arm/arm/locore-v4.S ============================================================================== --- head/sys/arm/arm/locore-v4.S Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/arm/locore-v4.S Mon Jan 16 16:44:13 2017 (r312292) @@ -37,7 +37,6 @@ #include <sys/syscall.h> #include <machine/asm.h> #include <machine/armreg.h> -#include <machine/cpuconf.h> #include <machine/pte-v4.h> __FBSDID("$FreeBSD$"); Modified: head/sys/arm/arm/locore-v6.S ============================================================================== --- head/sys/arm/arm/locore-v6.S Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/arm/locore-v6.S Mon Jan 16 16:44:13 2017 (r312292) @@ -34,7 +34,6 @@ #include <machine/asmacros.h> #include <machine/armreg.h> #include <machine/sysreg.h> -#include <machine/cpuconf.h> #include <machine/pte-v6.h> __FBSDID("$FreeBSD$"); Modified: head/sys/arm/include/atomic.h ============================================================================== --- head/sys/arm/include/atomic.h Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/include/atomic.h Mon Jan 16 16:44:13 2017 (r312292) @@ -44,8 +44,6 @@ #ifndef _KERNEL #include <machine/sysarch.h> -#else -#include <machine/cpuconf.h> #endif #if __ARM_ARCH >= 6 Modified: head/sys/arm/include/cpufunc.h ============================================================================== --- head/sys/arm/include/cpufunc.h Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/include/cpufunc.h Mon Jan 16 16:44:13 2017 (r312292) @@ -48,7 +48,6 @@ #include <sys/types.h> #include <machine/armreg.h> -#include <machine/cpuconf.h> static __inline void breakpoint(void) Modified: head/sys/arm/include/pcpu.h ============================================================================== --- head/sys/arm/include/pcpu.h Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/include/pcpu.h Mon Jan 16 16:44:13 2017 (r312292) @@ -32,8 +32,6 @@ #ifdef _KERNEL -#include <machine/cpuconf.h> - #define ALT_STACK_SIZE 128 struct vmspace; Modified: head/sys/arm/include/pmap-v4.h ============================================================================== --- head/sys/arm/include/pmap-v4.h Mon Jan 16 16:19:55 2017 (r312291) +++ head/sys/arm/include/pmap-v4.h Mon Jan 16 16:44:13 2017 (r312292) @@ -51,7 +51,30 @@ #define _MACHINE_PMAP_V4_H_ #include <machine/pte-v4.h> -#include <machine/cpuconf.h> + +/* + * Define the MMU types we support based on the cpu types. While the code has + * some theoretical support for multiple MMU types in a single kernel, there are + * no actual working configurations that use that feature. + */ +#if (defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_FA526)) +#define ARM_MMU_GENERIC 1 +#else +#define ARM_MMU_GENERIC 0 +#endif + +#if (defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_XSCALE_81342)) +#define ARM_MMU_XSCALE 1 +#else +#define ARM_MMU_XSCALE 0 +#endif + +#define ARM_NMMUS (ARM_MMU_GENERIC + ARM_MMU_XSCALE) +#if ARM_NMMUS == 0 && !defined(KLD_MODULE) && defined(_KERNEL) +#error ARM_NMMUS is 0 +#endif + /* * Pte related macros */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701161644.v0GGiDcU045297>