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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/conf/files.arm,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/conf/files.arm,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.89
retrieving revision 1.89.6.2
diff -u -p -r1.89 -r1.89.6.2
--- src/sys/arch/arm/conf/files.arm	2008/01/26 02:06:04	1.89
+++ src/sys/arch/arm/conf/files.arm	2008/06/02 13:21:53	1.89.6.2
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.89 2008/01/26 02:06:04 chris Exp $
+#	$NetBSD: files.arm,v 1.89.6.2 2008/06/02 13:21:53 mjf Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag				ARM32
@@ -11,6 +11,9 @@ defflag	opt_cputypes.h		CPU_ARM6 CPU_ARM
 				CPU_XSCALE_80200 CPU_XSCALE_80321
 				CPU_XSCALE_PXA250 CPU_XSCALE_PXA270
 				CPU_XSCALE_IXP425
+defflag	opt_cputypes.h		CPU_ARM1136: CPU_ARM11
+defflag	opt_cputypes.h		CPU_ARM1176: CPU_ARM11
+defflag opt_cputypes.h		FPU_VFP
 
 defparam opt_cpuoptions.h	XSCALE_CCLKCFG
 defflag  opt_cpuoptions.h	XSCALE_CACHE_WRITE_THROUGH
@@ -19,6 +22,9 @@ defflag  opt_cpuoptions.h	XSCALE_NO_COAL
 defflag  opt_cpuoptions.h	XSCALE_CACHE_READ_WRITE_ALLOCATE
 defflag  opt_cpuoptions.h	ARM32_DISABLE_ALIGNMENT_FAULTS
 defflag  opt_cpuoptions.h	ARM9_CACHE_WRITE_THROUGH
+defflag  opt_cpuoptions.h	PROCESS_ID_IS_CURLWP
+defflag  opt_cpuoptions.h	PROCESS_ID_IS_CURCPU
+defflag  opt_cpuoptions.h	ARM11_PMC
 
 # Interrupt implementation header definition.
 defparam opt_arm_intr_impl.h	ARM_INTR_IMPL
@@ -35,11 +41,15 @@ file	arch/arm/fpe-arm/armfpe_glue.S		arm
 file	arch/arm/fpe-arm/armfpe_init.c		armfpe
 file	arch/arm/fpe-arm/armfpe.S		armfpe
 
+# VFP support
+file	arch/arm/vfp/vfp_init.c			fpu_vfp
+
 # PMAP_DEBUG (heavily abused option)
 defflag				PMAP_DEBUG
 
 # New PMAP options
-defflag	opt_arm32_pmap.h	ARM32_NEW_VM_LAYOUT
+defflag	opt_arm32_pmap.h	ARM32_NEW_VM_LAYOUT PMAPCOUNTERS
+				PMAP_STEAL_MEMORY
 
 # MI console support
 file	dev/cons.c
@@ -56,7 +66,7 @@ file	arch/arm/arm/fiq.c
 file	arch/arm/arm/fiq_subr.S
 
 # mainbus files
-device	mainbus { [base = -1], [dack = -1], [irq = -1] }
+device	mainbus { [base = -1], [size = 0], [dack = -1], [irq = -1] }
 attach	mainbus at root
 file	arch/arm/mainbus/mainbus.c		mainbus & arm32
 file	arch/arm/mainbus/mainbus_io.c		mainbus & arm32
@@ -92,6 +102,7 @@ file	arch/arm/arm/cpufunc_asm_arm8.S		cp
 file	arch/arm/arm/cpufunc_asm_arm9.S		cpu_arm9
 file	arch/arm/arm/cpufunc_asm_arm10.S	cpu_arm9e | cpu_arm10
 file	arch/arm/arm/cpufunc_asm_arm11.S	cpu_arm11
+file	arch/arm/arm/cpufunc_asm_arm1136.S	cpu_arm1136
 file	arch/arm/arm/cpufunc_asm_armv4.S	cpu_arm9 | cpu_arm9e |
 							cpu_arm10 |
 							cpu_sa110 |
@@ -103,8 +114,10 @@ file	arch/arm/arm/cpufunc_asm_armv4.S	cp
 							cpu_xscale_ixp425 |
 							cpu_xscale_pxa250 |
 							cpu_xscale_pxa270
-file	arch/arm/arm/cpufunc_asm_armv5.S	cpu_arm10 | cpu_arm11
+file	arch/arm/arm/cpufunc_asm_armv5.S	cpu_arm10
 file	arch/arm/arm/cpufunc_asm_armv5_ec.S	cpu_arm9e | cpu_arm10
+file	arch/arm/arm/cpufunc_asm_armv6.S	cpu_arm11
+makeoptions	cpu_arm11	"AOPTS.cpufunc_asm_armv6.S"+="-Wa,-march=armv6"
 file	arch/arm/arm/cpufunc_asm_sa1.S		cpu_sa110 | cpu_sa1100 |
 							cpu_sa1110 |
 							cpu_ixp12x0
@@ -146,6 +159,10 @@ file	arch/arm/arm32/sys_machdep.c		arm32
 file	arch/arm/arm32/vm_machdep.c		arm32
 file	arch/arm/arm32/atomic.S			arm32
 
+# files less common to arm32 implementations...
+file	kern/kern_cctr.c			arm11
+file	arch/arm/arm32/arm11_pmc.c		arm11_pmc
+
 # arm32 library functions
 file	arch/arm/arm32/bcopy_page.S		arm32