Subject: CVS commit: syssrc/sys/arch
To: None <>
From: Jason R Thorpe <>
List: source-changes
Date: 04/12/2002 21:50:34
Module Name:	syssrc
Committed By:	thorpej
Date:		Fri Apr 12 18:50:33 UTC 2002

Modified Files:
	syssrc/sys/arch/acorn26/acorn26: cpu.c except.c locore.S pmap.c
	syssrc/sys/arch/acorn32/acorn32: rpc_machdep.c
	syssrc/sys/arch/arm/arm: cpufunc.c fiq_subr.S undefined.c
	syssrc/sys/arch/arm/arm32: cpu.c fault.c
	syssrc/sys/arch/arm/conf: files.arm
	syssrc/sys/arch/arm/footbridge: footbridge.c
	syssrc/sys/arch/arm/include: cpu.h cpufunc.h
	syssrc/sys/arch/arm/include/arm32: pmap.h
	syssrc/sys/arch/arm/sa11x0: sa11x0_irq.S sa11x0_irqhandler.c
	syssrc/sys/arch/cats/include: irqhandler.h
	syssrc/sys/arch/evbarm/ifpga: ifpga.c irqhandler.h
	syssrc/sys/arch/hpcarm/hpcarm: hpc_machdep.c
	syssrc/sys/arch/hpcarm/include: irqhandler.h
	syssrc/sys/arch/hpcarm/sa11x0: sa11x0_irq.S sa11x0_irqhandler.c
	syssrc/sys/arch/netwinder/include: irqhandler.h
Added Files:
	syssrc/sys/arch/arm/include: cpuconf.h

Log Message:
Centralize ARM CPU configuration information by adding a new header
file, <arm/cpuconf.h>, which pulls in "opt_cputypes.h" and then defines
the following:
* CPU_NTYPES -- now many CPU types are configured into the kernel.  What
  you really want to know is "== 1" or "> 1".
* Defines ARM_ARCH_2, ARM_ARCH_3, ARM_ARCH_4, ARM_ARCH_5, depending
  on which ARM architecture versions are configured (based on CPU_*
  options).  Also defines ARM_NARCH to determins how many architecture
  versions are configured.
  which classes of ARM MMUs are configured into the kernel, and ARM_NMMUS
  to determine how many MMU classes are configured.

Remove the needless inclusion of "opt_cputypes.h" in several places.
Convert remaining users to <arm/cpuconf.h>.

To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 syssrc/sys/arch/acorn26/acorn26/cpu.c \
    syssrc/sys/arch/acorn26/acorn26/except.c \
    syssrc/sys/arch/acorn26/acorn26/locore.S \
cvs rdiff -r1.34 -r1.35 syssrc/sys/arch/acorn32/acorn32/rpc_machdep.c
cvs rdiff -r1.40 -r1.41 syssrc/sys/arch/arm/arm/cpufunc.c
cvs rdiff -r1.2 -r1.3 syssrc/sys/arch/arm/arm/fiq_subr.S
cvs rdiff -r1.13 -r1.14 syssrc/sys/arch/arm/arm/undefined.c
cvs rdiff -r1.32 -r1.33 syssrc/sys/arch/arm/arm32/cpu.c
cvs rdiff -r1.17 -r1.18 syssrc/sys/arch/arm/arm32/fault.c
cvs rdiff -r1.56 -r1.57 syssrc/sys/arch/arm/conf/files.arm
cvs rdiff -r1.4 -r1.5 syssrc/sys/arch/arm/footbridge/footbridge.c
cvs rdiff -r1.25 -r1.26 syssrc/sys/arch/arm/include/cpu.h
cvs rdiff -r0 -r1.1 syssrc/sys/arch/arm/include/cpuconf.h
cvs rdiff -r1.20 -r1.21 syssrc/sys/arch/arm/include/cpufunc.h
cvs rdiff -r1.51 -r1.52 syssrc/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -r1.1 -r1.2 syssrc/sys/arch/arm/sa11x0/sa11x0_irq.S \
cvs rdiff -r1.3 -r1.4 syssrc/sys/arch/cats/include/irqhandler.h
cvs rdiff -r1.6 -r1.7 syssrc/sys/arch/evbarm/ifpga/ifpga.c
cvs rdiff -r1.1 -r1.2 syssrc/sys/arch/evbarm/ifpga/irqhandler.h
cvs rdiff -r1.45 -r1.46 syssrc/sys/arch/hpcarm/hpcarm/hpc_machdep.c
cvs rdiff -r1.4 -r1.5 syssrc/sys/arch/hpcarm/include/irqhandler.h
cvs rdiff -r1.6 -r1.7 syssrc/sys/arch/hpcarm/sa11x0/sa11x0_irq.S
cvs rdiff -r1.7 -r1.8 syssrc/sys/arch/hpcarm/sa11x0/sa11x0_irqhandler.c
cvs rdiff -r1.4 -r1.5 syssrc/sys/arch/netwinder/include/irqhandler.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.