CVS commit: src/sys/arch/arm/conf

2020-07-27 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Mon Jul 27 20:49:46 UTC 2020

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Fix outdated comment.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.158 src/sys/arch/arm/conf/files.arm:1.159
--- src/sys/arch/arm/conf/files.arm:1.158	Mon Jun 29 23:56:31 2020
+++ src/sys/arch/arm/conf/files.arm	Mon Jul 27 20:49:45 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.158 2020/06/29 23:56:31 riastradh Exp $
+#	$NetBSD: files.arm,v 1.159 2020/07/27 20:49:45 riastradh Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -263,6 +263,5 @@ file	arch/arm/arm/linux_trap.c		compat_l
 # profiling support
 file	dev/tprof/tprof_armv7.c			tprof
 
-# vpaes with ARM NEON -- disabled for now pending arm32 kernel fpu
-# support and ctf
+# vpaes with ARM NEON
 include "crypto/aes/arch/arm/files.aesneon"



CVS commit: src/sys/arch/arm/conf

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Jan 21 05:05:22 UTC 2020

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Sort a bit


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.151 src/sys/arch/arm/conf/files.arm:1.152
--- src/sys/arch/arm/conf/files.arm:1.151	Tue Jan 21 05:02:55 2020
+++ src/sys/arch/arm/conf/files.arm	Tue Jan 21 05:05:22 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.151 2020/01/21 05:02:55 skrll Exp $
+#	$NetBSD: files.arm,v 1.152 2020/01/21 05:05:22 skrll Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -154,8 +154,8 @@ define	bus_space_generic
 file	arch/arm/arm/bus_space_asm_generic.S	bus_space_generic
 file	arch/arm/arm/bus_space_notimpl.S	arm32
 
-file	arch/arm/arm/arm_machdep.c
 file	arch/arm/arm/arm_cpu_topology.c
+file	arch/arm/arm/arm_machdep.c
 file	arch/arm/arm/ast.c
 file	arch/arm/arm/bcopyinout.S
 file	arch/arm/arm/blockio.S
@@ -164,7 +164,6 @@ file	arch/arm/arm/compat_13_machdep.c	co
 file	arch/arm/arm/compat_16_machdep.c	compat_16
 file	arch/arm/arm/copystr.S
 file	arch/arm/arm/core_machdep.c		coredump
-file	arch/arm/arm/cpu_in_cksum.S		(inet | inet6) & cpu_in_cksum
 file	arch/arm/arm/cpufunc.c
 file	arch/arm/arm/cpufunc_asm.S
 file	arch/arm/arm/cpufunc_asm_arm67.S	cpu_arm6 | cpu_arm7
@@ -200,6 +199,7 @@ file	arch/arm/arm/cpufunc_asm_xscale.S	c
 file	arch/arm/arm/cpufunc_asm_ixp12x0.S	cpu_ixp12x0
 file	arch/arm/arm/cpufunc_asm_sheeva.S	cpu_sheeva
 file	arch/arm/arm/cpu_exec.c
+file	arch/arm/arm/cpu_in_cksum.S		(inet | inet6) & cpu_in_cksum
 file	arch/arm/arm/fusu.S
 file	arch/arm/arm/idle_machdep.c
 file	arch/arm/arm/lock_cas.S



CVS commit: src/sys/arch/arm/conf

2020-01-20 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Jan 21 05:02:55 UTC 2020

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.150 src/sys/arch/arm/conf/files.arm:1.151
--- src/sys/arch/arm/conf/files.arm:1.150	Wed Jan 15 08:34:04 2020
+++ src/sys/arch/arm/conf/files.arm	Tue Jan 21 05:02:55 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.150 2020/01/15 08:34:04 mrg Exp $
+#	$NetBSD: files.arm,v 1.151 2020/01/21 05:02:55 skrll Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -155,7 +155,7 @@ file	arch/arm/arm/bus_space_asm_generic.
 file	arch/arm/arm/bus_space_notimpl.S	arm32
 
 file	arch/arm/arm/arm_machdep.c
-file	arch/arm/arm/arm_cpu_topology.c	
+file	arch/arm/arm/arm_cpu_topology.c
 file	arch/arm/arm/ast.c
 file	arch/arm/arm/bcopyinout.S
 file	arch/arm/arm/blockio.S



CVS commit: src/sys/arch/arm/conf

2020-01-05 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Jan  6 07:40:45 UTC 2020

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Use CFLAGS instead of COPTS for -mapcs-frame when using DDB.

Discussed with mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.52 src/sys/arch/arm/conf/Makefile.arm:1.53
--- src/sys/arch/arm/conf/Makefile.arm:1.52	Thu Jan  2 14:33:55 2020
+++ src/sys/arch/arm/conf/Makefile.arm	Mon Jan  6 07:40:45 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.52 2020/01/02 14:33:55 skrll Exp $
+#	$NetBSD: Makefile.arm,v 1.53 2020/01/06 07:40:45 skrll Exp $
 
 # Makefile for NetBSD
 #
@@ -78,7 +78,7 @@ CFLAGS+=	-mno-unaligned-access
 
 OPT_DDB=	%DDB%
 .if !empty(OPT_DDB) && ${HAVE_GCC:U0} > 0
-COPTS+=		-mapcs-frame
+CFLAGS+=	-mapcs-frame
 .endif
 
 ##



CVS commit: src/sys/arch/arm/conf

2020-01-02 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Thu Jan  2 14:33:55 UTC 2020

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
gcc 8 needs -mapcs-frame when DDB is specified for backtrace to work


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.51 src/sys/arch/arm/conf/Makefile.arm:1.52
--- src/sys/arch/arm/conf/Makefile.arm:1.51	Mon Nov 11 22:45:27 2019
+++ src/sys/arch/arm/conf/Makefile.arm	Thu Jan  2 14:33:55 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.51 2019/11/11 22:45:27 joerg Exp $
+#	$NetBSD: Makefile.arm,v 1.52 2020/01/02 14:33:55 skrll Exp $
 
 # Makefile for NetBSD
 #
@@ -76,6 +76,11 @@ CPPFLAGS.cpufunc_asm_xscale.S+=	-mcpu=xs
 CFLAGS+=	-mno-unaligned-access
 .endif
 
+OPT_DDB=	%DDB%
+.if !empty(OPT_DDB) && ${HAVE_GCC:U0} > 0
+COPTS+=		-mapcs-frame
+.endif
+
 ##
 ## (3) libkern and compat
 ##



CVS commit: src/sys/arch/arm/conf

2018-09-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun Sep 16 15:40:36 UTC 2018

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.141 src/sys/arch/arm/conf/files.arm:1.142
--- src/sys/arch/arm/conf/files.arm:1.141	Fri Aug 10 17:47:14 2018
+++ src/sys/arch/arm/conf/files.arm	Sun Sep 16 15:40:36 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.141 2018/08/10 17:47:14 maxv Exp $
+#	$NetBSD: files.arm,v 1.142 2018/09/16 15:40:36 skrll Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -87,7 +87,7 @@ defflag  opt_arm_bus_space.h	__BUS_SPACE
 defflag opt_arm_timer.h		__HAVE_GENERIC_CPU_INITCLOCKS
 
 # Floating point emulator
-obsolete defflagARMFPE
+obsolete defflag		ARMFPE
 
 # VFP support
 file	arch/arm/vfp/vfp_init.c			arm32



CVS commit: src/sys/arch/arm/conf

2018-08-10 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri Aug 10 17:47:14 UTC 2018

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
remove reference to CPU_ARMV2, suggested by jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.140 src/sys/arch/arm/conf/files.arm:1.141
--- src/sys/arch/arm/conf/files.arm:1.140	Fri Aug 10 16:17:30 2018
+++ src/sys/arch/arm/conf/files.arm	Fri Aug 10 17:47:14 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.140 2018/08/10 16:17:30 maxv Exp $
+#	$NetBSD: files.arm,v 1.141 2018/08/10 17:47:14 maxv Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -8,8 +8,7 @@ defflag	opt_cpuoptions.h	ARM32_DISABLE_A
 
 # CPU types.  Make sure to update  if you change this list.
 defflag	opt_cputypes.h		CPU_PRE_ARMV6
-defflag	opt_cputypes.h		CPU_ARMV2: CPU_PRE_ARMV6
-defflag	opt_cputypes.h		CPU_ARMV3: CPU_ARMV2
+defflag	opt_cputypes.h		CPU_ARMV3: CPU_PRE_ARMV6
 defflag	opt_cputypes.h		CPU_ARMV4: CPU_ARMV3
 defflag	opt_cputypes.h		CPU_ARMV4T: CPU_ARMV4
 defflag	opt_cputypes.h		CPU_ARMV5T: CPU_ARMV4T



CVS commit: src/sys/arch/arm/conf

2017-12-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Dec 15 16:41:40 UTC 2017

Modified Files:
src/sys/arch/arm/conf: std.arm

Log Message:
we always need the fdt option now, defined or not.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/conf/std.arm

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

Modified files:

Index: src/sys/arch/arm/conf/std.arm
diff -u src/sys/arch/arm/conf/std.arm:1.3 src/sys/arch/arm/conf/std.arm:1.4
--- src/sys/arch/arm/conf/std.arm:1.3	Mon Feb 16 05:19:29 2015
+++ src/sys/arch/arm/conf/std.arm	Fri Dec 15 11:41:40 2017
@@ -1,5 +1,6 @@
-#	$NetBSD: std.arm,v 1.3 2015/02/16 10:19:29 skrll Exp $
+#	$NetBSD: std.arm,v 1.4 2017/12/15 16:41:40 christos Exp $
 #
 # standard NetBSD/arm options
 
 options		CPU_IN_CKSUM
+defflag		FDT



CVS commit: src/sys/arch/arm/conf

2017-11-10 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Nov 10 22:07:30 UTC 2017

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Add CPU_CORTEXA35


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.135 src/sys/arch/arm/conf/files.arm:1.136
--- src/sys/arch/arm/conf/files.arm:1.135	Sun Oct  8 15:29:33 2017
+++ src/sys/arch/arm/conf/files.arm	Fri Nov 10 22:07:30 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.135 2017/10/08 15:29:33 jmcneill Exp $
+#	$NetBSD: files.arm,v 1.136 2017/11/10 22:07:30 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -50,6 +50,7 @@ defflag	opt_cputypes.h		CPU_CORTEXA8: CP
 defflag	opt_cputypes.h		CPU_CORTEXA9: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA15: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA17: CPU_CORTEX
+defflag	opt_cputypes.h		CPU_CORTEXA35: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA53: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA57: CPU_CORTEX
 defflag	opt_cputypes.h		FPU_VFP



CVS commit: src/sys/arch/arm/conf

2017-10-08 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sun Oct  8 15:29:33 UTC 2017

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
defflag CPU_CORTEXA53


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.134 src/sys/arch/arm/conf/files.arm:1.135
--- src/sys/arch/arm/conf/files.arm:1.134	Thu Aug 24 13:06:23 2017
+++ src/sys/arch/arm/conf/files.arm	Sun Oct  8 15:29:33 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.134 2017/08/24 13:06:23 jmcneill Exp $
+#	$NetBSD: files.arm,v 1.135 2017/10/08 15:29:33 jmcneill Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -50,7 +50,8 @@ defflag	opt_cputypes.h		CPU_CORTEXA8: CP
 defflag	opt_cputypes.h		CPU_CORTEXA9: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA15: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA17: CPU_CORTEX
-defflag opt_cputypes.h		CPU_CORTEXA57: CPU_CORTEX
+defflag	opt_cputypes.h		CPU_CORTEXA53: CPU_CORTEX
+defflag	opt_cputypes.h		CPU_CORTEXA57: CPU_CORTEX
 defflag	opt_cputypes.h		FPU_VFP
 
 defparam opt_cpuoptions.h	XSCALE_CCLKCFG



CVS commit: src/sys/arch/arm/conf

2015-02-16 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Mon Feb 16 10:19:29 UTC 2015

Modified Files:
src/sys/arch/arm/conf: std.arm

Log Message:
Re-enable CPI_IN_CKSUM now the bugs are fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/conf/std.arm

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

Modified files:

Index: src/sys/arch/arm/conf/std.arm
diff -u src/sys/arch/arm/conf/std.arm:1.2 src/sys/arch/arm/conf/std.arm:1.3
--- src/sys/arch/arm/conf/std.arm:1.2	Fri Jan 30 14:32:19 2015
+++ src/sys/arch/arm/conf/std.arm	Mon Feb 16 10:19:29 2015
@@ -1,5 +1,5 @@
-#	$NetBSD: std.arm,v 1.2 2015/01/30 14:32:19 joerg Exp $
+#	$NetBSD: std.arm,v 1.3 2015/02/16 10:19:29 skrll Exp $
 #
 # standard NetBSD/arm options
 
-#options		CPU_IN_CKSUM
+options		CPU_IN_CKSUM



CVS commit: src/sys/arch/arm/conf

2015-01-30 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Fri Jan 30 14:32:19 UTC 2015

Modified Files:
src/sys/arch/arm/conf: std.arm

Log Message:
Disable ARM's CPU_IN_CKSUM until the bugs are fixed.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/conf/std.arm

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

Modified files:

Index: src/sys/arch/arm/conf/std.arm
diff -u src/sys/arch/arm/conf/std.arm:1.1 src/sys/arch/arm/conf/std.arm:1.2
--- src/sys/arch/arm/conf/std.arm:1.1	Sun Jan 27 12:37:10 2008
+++ src/sys/arch/arm/conf/std.arm	Fri Jan 30 14:32:19 2015
@@ -1,5 +1,5 @@
-#	$NetBSD: std.arm,v 1.1 2008/01/27 12:37:10 chris Exp $
+#	$NetBSD: std.arm,v 1.2 2015/01/30 14:32:19 joerg Exp $
 #
 # standard NetBSD/arm options
 
-options		CPU_IN_CKSUM
+#options		CPU_IN_CKSUM



CVS commit: src/sys/arch/arm/conf

2014-12-01 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Dec  1 08:39:43 UTC 2014

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Add CPU_CORTEXA17


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.128 src/sys/arch/arm/conf/files.arm:1.129
--- src/sys/arch/arm/conf/files.arm:1.128	Wed Nov 26 04:20:30 2014
+++ src/sys/arch/arm/conf/files.arm	Mon Dec  1 08:39:43 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.128 2014/11/26 04:20:30 matt Exp $
+#	$NetBSD: files.arm,v 1.129 2014/12/01 08:39:43 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -49,6 +49,7 @@ defflag	opt_cputypes.h		CPU_CORTEXA7: CP
 defflag	opt_cputypes.h		CPU_CORTEXA8: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA9: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA15: CPU_CORTEX
+defflag	opt_cputypes.h		CPU_CORTEXA17: CPU_CORTEX
 defflag	opt_cputypes.h		FPU_VFP
 
 defparam opt_cpuoptions.h	XSCALE_CCLKCFG



CVS commit: src/sys/arch/arm/conf

2014-11-25 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed Nov 26 04:20:30 UTC 2014

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Add option ARM_HAS_LPAE


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.127 src/sys/arch/arm/conf/files.arm:1.128
--- src/sys/arch/arm/conf/files.arm:1.127	Mon Apr 14 20:50:47 2014
+++ src/sys/arch/arm/conf/files.arm	Wed Nov 26 04:20:30 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.127 2014/04/14 20:50:47 matt Exp $
+#	$NetBSD: files.arm,v 1.128 2014/11/26 04:20:30 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -63,6 +63,7 @@ defflag  opt_cpuoptions.h	ARM11_PMC CORT
 defflag  opt_cpuoptions.h	ARM11_CACHE_WRITE_THROUGH
 defflag	 opt_cpuoptions.h	ARM11_COMPAT_MMU
 defflag	 opt_cpuoptions.h	ARM_HAS_VBAR
+defflag	 opt_cpuoptions.h	ARM_HAS_LPAE
 # use extended small page in compatible MMU mode for ARMv6
 defflag  opt_cpuoptions.h	SHEEVA_L2_CACHE
 defflag  opt_cpuoptions.h	SHEEVA_L2_CACHE_WT: SHEEVA_L2_CACHE



CVS commit: src/sys/arch/arm/conf

2014-08-14 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Thu Aug 14 20:59:54 UTC 2014

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Do the wildcard symbol dance for the debug case as well.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.43 src/sys/arch/arm/conf/Makefile.arm:1.44
--- src/sys/arch/arm/conf/Makefile.arm:1.43	Thu Aug 14 18:39:39 2014
+++ src/sys/arch/arm/conf/Makefile.arm	Thu Aug 14 20:59:54 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.43 2014/08/14 18:39:39 joerg Exp $
+#	$NetBSD: Makefile.arm,v 1.44 2014/08/14 20:59:54 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -87,7 +87,8 @@ SYSTEM_LD_TAIL?=	${SYSTEM_LD_TAIL_DBSYM}
 --strip-symbol='[$$][atd]\.*' $@;   \
 			${SIZE} $@; chmod 755 $@
 .else
-STRIPFLAGS=-g --strip-symbol='$$a' --strip-symbol='$$t' --strip-symbol='$$d'
+STRIPFLAGS=-g --wildcard --strip-symbol='[$$][atd]' \
+	   --strip-symbol='[$$][atd]\.*'
 .endif
 
 ##



CVS commit: src/sys/arch/arm/conf

2014-04-16 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed Apr 16 22:40:24 UTC 2014

Modified Files:
src/sys/arch/arm/conf: majors.arm32

Log Message:
Add ctcom


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/conf/majors.arm32

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

Modified files:

Index: src/sys/arch/arm/conf/majors.arm32
diff -u src/sys/arch/arm/conf/majors.arm32:1.34 src/sys/arch/arm/conf/majors.arm32:1.35
--- src/sys/arch/arm/conf/majors.arm32:1.34	Mon Jan 28 19:31:14 2013
+++ src/sys/arch/arm/conf/majors.arm32	Wed Apr 16 22:40:24 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.arm32,v 1.34 2013/01/28 19:31:14 jmcneill Exp $
+#	$NetBSD: majors.arm32,v 1.35 2014/04/16 22:40:24 matt Exp $
 #
 # Device majors for arm32
 #
@@ -91,6 +91,7 @@ device-major	clockctl	char 94			clockctl
 device-major	irframe		char 95			irframedrv
 device-major	cir		char 96			cir
 device-major	radio		char 97			radio
+device-major	ctcom		char 98			ctcom
 device-major	kttcp		char 99			kttcp
 device-major	ixpcom		char 100		ixpcom
 device-major	sysmon		char 101		sysmon_envsys | sysmon_wdog | sysmon_power



CVS commit: src/sys/arch/arm/conf

2014-03-02 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sun Mar  2 13:21:59 UTC 2014

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Explicitly enable VFP support for vfp_init.c. Fixes build of
INTEGRATOR_CP with clang.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.41 src/sys/arch/arm/conf/Makefile.arm:1.42
--- src/sys/arch/arm/conf/Makefile.arm:1.41	Thu Jan 23 20:58:55 2014
+++ src/sys/arch/arm/conf/Makefile.arm	Sun Mar  2 13:21:59 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.41 2014/01/23 20:58:55 martin Exp $
+#	$NetBSD: Makefile.arm,v 1.42 2014/03/02 13:21:59 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -35,6 +35,7 @@ GENASSYM_CONF=	${ARM}/arm32/genassym.cf
 # CPPFLAGS set by platform-specific Makefile fragment.
 AFLAGS+=	-x assembler-with-cpp
 COPTS.arm32_kvminit.c+=		-fno-stack-protector
+COPTS.vfp_init.c=		-mfpu=vfp
 AFLAGS.bcopyinout.S+=-marm
 AFLAGS.cpuswitch.S+=-marm -mfpu=vfp
 AFLAGS.locore.S+=-marm



CVS commit: src/sys/arch/arm/conf

2014-02-20 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Feb 20 17:39:59 UTC 2014

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
cpu_cortex doesn't need the arm11 cpufuncs any more


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.123 src/sys/arch/arm/conf/files.arm:1.124
--- src/sys/arch/arm/conf/files.arm:1.123	Tue Nov 12 17:05:09 2013
+++ src/sys/arch/arm/conf/files.arm	Thu Feb 20 17:39:59 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.123 2013/11/12 17:05:09 matt Exp $
+#	$NetBSD: files.arm,v 1.124 2014/02/20 17:39:59 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -136,7 +136,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 |
 			cpu_sheeva
-file	arch/arm/arm/cpufunc_asm_arm11.S	cpu_arm11 | cpu_cortex
+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_arm11x6.S	cpu_arm1136 | cpu_arm1176
 file	arch/arm/arm/cpufunc_asm_armv4.S	cpu_arm9 | cpu_arm9e |



CVS commit: src/sys/arch/arm/conf

2014-01-23 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Jan 23 20:58:55 UTC 2014

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Compile the armv4 cpufunc file with -mcpu=arm8 instead of arm9, to avoid
an armv4t marked object file which causes failure in the shark objcopy
step when creating the a.out version of the kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.40 src/sys/arch/arm/conf/Makefile.arm:1.41
--- src/sys/arch/arm/conf/Makefile.arm:1.40	Sat Jan  4 01:33:11 2014
+++ src/sys/arch/arm/conf/Makefile.arm	Thu Jan 23 20:58:55 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.40 2014/01/04 01:33:11 joerg Exp $
+#	$NetBSD: Makefile.arm,v 1.41 2014/01/23 20:58:55 martin Exp $
 
 # Makefile for NetBSD
 #
@@ -47,7 +47,7 @@ CFLAGS+=	 -mfloat-abi=soft
 
 # This files use instructions deprecated for ARMv7+, but still
 # included in kernel that build with higher -mcpu=... settings.
-CPPFLAGS.cpufunc_asm_armv4.S+=	-mcpu=arm9
+CPPFLAGS.cpufunc_asm_armv4.S+=	-mcpu=arm8
 CPPFLAGS.cpufunc_asm_armv6.S+=	-mcpu=arm1136j-s
 CPPFLAGS.cpufunc_asm_arm11.S+=	-mcpu=arm1136j-s
 CPPFLAGS.cpufunc_asm_xscale.S+=	-mcpu=xscale



CVS commit: src/sys/arch/arm/conf

2014-01-03 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Sat Jan  4 01:33:11 UTC 2014

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Explicitly force a CPU for the assembler for the compatibility
cpu_func_* files. LLVM complains about the use of deprecated
instructions when -march=armv7 or equivalent is in use.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.39 src/sys/arch/arm/conf/Makefile.arm:1.40
--- src/sys/arch/arm/conf/Makefile.arm:1.39	Fri Dec 27 04:41:29 2013
+++ src/sys/arch/arm/conf/Makefile.arm	Sat Jan  4 01:33:11 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.39 2013/12/27 04:41:29 matt Exp $
+#	$NetBSD: Makefile.arm,v 1.40 2014/01/04 01:33:11 joerg Exp $
 
 # Makefile for NetBSD
 #
@@ -45,6 +45,13 @@ AFLAGS.blockio.S+=-marm
 AFLAGS.copystr.S+=-marm
 CFLAGS+=	 -mfloat-abi=soft
 
+# This files use instructions deprecated for ARMv7+, but still
+# included in kernel that build with higher -mcpu=... settings.
+CPPFLAGS.cpufunc_asm_armv4.S+=	-mcpu=arm9
+CPPFLAGS.cpufunc_asm_armv6.S+=	-mcpu=arm1136j-s
+CPPFLAGS.cpufunc_asm_arm11.S+=	-mcpu=arm1136j-s
+CPPFLAGS.cpufunc_asm_xscale.S+=	-mcpu=xscale
+
 ##
 ## (3) libkern and compat
 ##



CVS commit: src/sys/arch/arm/conf

2013-12-26 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Dec 27 04:41:29 UTC 2013

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Pass -mfpu=vfp so GAS won't complain about vmsrne


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.38 src/sys/arch/arm/conf/Makefile.arm:1.39
--- src/sys/arch/arm/conf/Makefile.arm:1.38	Mon Oct 28 22:52:04 2013
+++ src/sys/arch/arm/conf/Makefile.arm	Fri Dec 27 04:41:29 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.38 2013/10/28 22:52:04 matt Exp $
+#	$NetBSD: Makefile.arm,v 1.39 2013/12/27 04:41:29 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -36,7 +36,7 @@ GENASSYM_CONF=	${ARM}/arm32/genassym.cf
 AFLAGS+=	-x assembler-with-cpp
 COPTS.arm32_kvminit.c+=		-fno-stack-protector
 AFLAGS.bcopyinout.S+=-marm
-AFLAGS.cpuswitch.S+=-marm
+AFLAGS.cpuswitch.S+=-marm -mfpu=vfp
 AFLAGS.locore.S+=-marm
 AFLAGS.fusu.S+=-marm
 AFLAGS.exception.S+=-marm



CVS commit: src/sys/arch/arm/conf

2013-12-24 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Tue Dec 24 17:03:07 UTC 2013

Modified Files:
src/sys/arch/arm/conf: kern.ldscript.tail

Log Message:
Make sure _edata is aligned to a 8-byte boundary.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/conf/kern.ldscript.tail

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

Modified files:

Index: src/sys/arch/arm/conf/kern.ldscript.tail
diff -u src/sys/arch/arm/conf/kern.ldscript.tail:1.2 src/sys/arch/arm/conf/kern.ldscript.tail:1.3
--- src/sys/arch/arm/conf/kern.ldscript.tail:1.2	Sun Dec 11 12:16:45 2005
+++ src/sys/arch/arm/conf/kern.ldscript.tail	Tue Dec 24 17:03:07 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.tail,v 1.2 2005/12/11 12:16:45 christos Exp $	*/
+/*	$NetBSD: kern.ldscript.tail,v 1.3 2013/12/24 17:03:07 matt Exp $	*/
 
   } =0
   PROVIDE (__etext = .);
@@ -13,6 +13,7 @@
 *(.sdata)
 *(.sdata.*)
   }
+  . = ALIGN(8);
   _edata = .;
   PROVIDE (edata = .);
   __bss_start = .;



CVS commit: src/sys/arch/arm/conf

2013-11-12 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Tue Nov 12 17:05:09 UTC 2013

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
CPU_ARMV[67] imply ARM32_DISABLE_ALIGNMENT_FAULTS
Make it explicit.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.122 src/sys/arch/arm/conf/files.arm:1.123
--- src/sys/arch/arm/conf/files.arm:1.122	Sat Aug 17 22:21:02 2013
+++ src/sys/arch/arm/conf/files.arm	Tue Nov 12 17:05:09 2013
@@ -1,10 +1,15 @@
-#	$NetBSD: files.arm,v 1.122 2013/08/17 22:21:02 matt Exp $
+#	$NetBSD: files.arm,v 1.123 2013/11/12 17:05:09 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
 
+# predefine for CPU_ARMV6 and CPU_ARMV7
+defflag	opt_cpuoptions.h	ARM32_DISABLE_ALIGNMENT_FAULTS
+
 # CPU types.  Make sure to update arm/cpuconf.h if you change this list.
-defflag	opt_cputypes.h		CPU_PRE_ARMV6 CPU_ARMV6 CPU_ARMV7
+defflag	opt_cputypes.h		CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARMV6: ARM32_DISABLE_ALIGNMENT_FAULTS
+defflag	opt_cputypes.h		CPU_ARMV7: ARM32_DISABLE_ALIGNMENT_FAULTS
 defflag	opt_cputypes.h		CPU_ARM2: CPU_PRE_ARMV6
 defflag	opt_cputypes.h		CPU_ARM250: CPU_PRE_ARMV6
 defflag	opt_cputypes.h		CPU_ARM3: CPU_PRE_ARMV6
@@ -44,7 +49,6 @@ defflag  opt_cpuoptions.h	XSCALE_CACHE_W
 defflag  opt_cpuoptions.h	XSCALE_CACHE_WRITE_BACK
 defflag  opt_cpuoptions.h	XSCALE_NO_COALESCE_WRITES
 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	TPIDRPRW_IS_CURLWP
 defflag  opt_cpuoptions.h	TPIDRPRW_IS_CURCPU



CVS commit: src/sys/arch/arm/conf

2013-10-28 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Mon Oct 28 22:52:04 UTC 2013

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Make sure certain files are always assembled with -marm


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.37 src/sys/arch/arm/conf/Makefile.arm:1.38
--- src/sys/arch/arm/conf/Makefile.arm:1.37	Sun Feb  3 11:36:55 2013
+++ src/sys/arch/arm/conf/Makefile.arm	Mon Oct 28 22:52:04 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.37 2013/02/03 11:36:55 skrll Exp $
+#	$NetBSD: Makefile.arm,v 1.38 2013/10/28 22:52:04 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -35,6 +35,14 @@ GENASSYM_CONF=	${ARM}/arm32/genassym.cf
 # CPPFLAGS set by platform-specific Makefile fragment.
 AFLAGS+=	-x assembler-with-cpp
 COPTS.arm32_kvminit.c+=		-fno-stack-protector
+AFLAGS.bcopyinout.S+=-marm
+AFLAGS.cpuswitch.S+=-marm
+AFLAGS.locore.S+=-marm
+AFLAGS.fusu.S+=-marm
+AFLAGS.exception.S+=-marm
+AFLAGS.irq_dispatch.S+=-marm
+AFLAGS.blockio.S+=-marm
+AFLAGS.copystr.S+=-marm
 CFLAGS+=	 -mfloat-abi=soft
 
 ##
@@ -42,6 +50,7 @@ CFLAGS+=	 -mfloat-abi=soft
 ##
 KERN_AS=	obj
 
+
 ##
 ## (4) local objects, compile rules, and dependencies
 ##
@@ -109,11 +118,20 @@ spl.o vectors.o: assym.h
 %RULES
 
 ##
-## (9) port independent kernel machinery
+## (9) after the config file is inserted
+##
+
+.for f in ${SFILES:T:Mcpufunc_asm*}
+AFLAGS.${f}+=-marm
+.endfor
+
+##
+## (10) port independent kernel machinery
 ##
+
 .include $S/conf/Makefile.kern.inc
 
 ##
-## (10) Appending make options.
+## (11) Appending make options.
 ##
 %MAKEOPTIONSAPPEND



CVS commit: src/sys/arch/arm/conf

2013-07-02 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Tue Jul  2 06:07:11 UTC 2013

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Rework to have CPU_PREARMV6, CPU_ARMV6, as well as CPU_ARMV7


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.120 src/sys/arch/arm/conf/files.arm:1.121
--- src/sys/arch/arm/conf/files.arm:1.120	Sat Jun 22 00:35:31 2013
+++ src/sys/arch/arm/conf/files.arm	Tue Jul  2 06:07:11 2013
@@ -1,17 +1,32 @@
-#	$NetBSD: files.arm,v 1.120 2013/06/22 00:35:31 matt Exp $
+#	$NetBSD: files.arm,v 1.121 2013/07/02 06:07:11 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
 
 # CPU types.  Make sure to update arm/cpuconf.h if you change this list.
-defflag	opt_cputypes.h		CPU_ARM2 CPU_ARM250 CPU_ARM3
-defflag	opt_cputypes.h		CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
-CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11 CPU_ARMV7
-CPU_SA110 CPU_SA1100 CPU_SA1110 CPU_IXP12X0
-CPU_FA526 CPU_XSCALE_80200 CPU_XSCALE_80321
-CPU_XSCALE_PXA250 CPU_XSCALE_PXA270
-CPU_XSCALE_IXP425 
-CPU_SHEEVA
+defflag	opt_cputypes.h		CPU_PRE_ARMV6 CPU_ARMV6 CPU_ARMV7
+defflag	opt_cputypes.h		CPU_ARM2: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM250: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM3: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM6: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM7: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM7TDMI: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM8: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM9: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM9E: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM10: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_SA110: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_SA1100: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_SA1110: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_IXP12X0: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_FA526: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_XSCALE_80200: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_XSCALE_80321: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_XSCALE_PXA250: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_XSCALE_PXA270: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_XSCALE_IXP425: CPU_PRE_ARMV6 
+defflag	opt_cputypes.h		CPU_SHEEVA: CPU_PRE_ARMV6
+defflag	opt_cputypes.h		CPU_ARM11: CPU_ARMV6
 defflag	opt_cputypes.h		CPU_ARM1136: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM1176: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM11MPCORE: CPU_ARM11
@@ -22,7 +37,7 @@ defflag	opt_cputypes.h		CPU_CORTEXA7: CP
 defflag	opt_cputypes.h		CPU_CORTEXA8: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA9: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA15: CPU_CORTEX
-defflag opt_cputypes.h		FPU_VFP
+defflag	opt_cputypes.h		FPU_VFP
 
 defparam opt_cpuoptions.h	XSCALE_CCLKCFG
 defflag  opt_cpuoptions.h	XSCALE_CACHE_WRITE_THROUGH
@@ -35,7 +50,7 @@ defflag  opt_cpuoptions.h	TPIDRPRW_IS_CU
 defflag  opt_cpuoptions.h	TPIDRPRW_IS_CURCPU
 defflag  opt_cpuoptions.h	ARM11_PMC CORTEX_PMC
 defflag  opt_cpuoptions.h	ARM11_CACHE_WRITE_THROUGH
-defflag	 opt_cpuoptions.h	ARM11MPCORE_COMPAT_MMU
+defflag	 opt_cpuoptions.h	ARM11_COMPAT_MMU
 defflag	 opt_cpuoptions.h	ARM_HAS_VBAR
 # use extended small page in compatible MMU mode for ARMv6
 defflag  opt_cpuoptions.h	ARMV6_EXTENDED_SMALL_PAGE



CVS commit: src/sys/arch/arm/conf

2013-06-21 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Jun 22 00:35:31 UTC 2013

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
File VBAR option


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.119 src/sys/arch/arm/conf/files.arm:1.120
--- src/sys/arch/arm/conf/files.arm:1.119	Wed Jun 12 21:34:12 2013
+++ src/sys/arch/arm/conf/files.arm	Sat Jun 22 00:35:31 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.119 2013/06/12 21:34:12 matt Exp $
+#	$NetBSD: files.arm,v 1.120 2013/06/22 00:35:31 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -36,7 +36,7 @@ defflag  opt_cpuoptions.h	TPIDRPRW_IS_CU
 defflag  opt_cpuoptions.h	ARM11_PMC CORTEX_PMC
 defflag  opt_cpuoptions.h	ARM11_CACHE_WRITE_THROUGH
 defflag	 opt_cpuoptions.h	ARM11MPCORE_COMPAT_MMU
-defflag	 opt_cpuoptions.h	ARM_USE_VBAR
+defflag	 opt_cpuoptions.h	ARM_HAS_VBAR
 # use extended small page in compatible MMU mode for ARMv6
 defflag  opt_cpuoptions.h	ARMV6_EXTENDED_SMALL_PAGE
 



CVS commit: src/sys/arch/arm/conf

2013-06-12 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed Jun 12 07:12:10 UTC 2013

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Add CPU_ARMV7 and make CPU_PJ4B and CPU_CORTEX instantiate it.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.117 src/sys/arch/arm/conf/files.arm:1.118
--- src/sys/arch/arm/conf/files.arm:1.117	Sun May 19 15:51:10 2013
+++ src/sys/arch/arm/conf/files.arm	Wed Jun 12 07:12:10 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.117 2013/05/19 15:51:10 rkujawa Exp $
+#	$NetBSD: files.arm,v 1.118 2013/06/12 07:12:10 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -6,16 +6,17 @@ defflagARM32
 # CPU types.  Make sure to update arm/cpuconf.h if you change this list.
 defflag	opt_cputypes.h		CPU_ARM2 CPU_ARM250 CPU_ARM3
 defflag	opt_cputypes.h		CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
-CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11
+CPU_ARM9 CPU_ARM9E CPU_ARM10 CPU_ARM11 CPU_ARMV7
 CPU_SA110 CPU_SA1100 CPU_SA1110 CPU_IXP12X0
-CPU_FA526 CPU_CORTEX CPU_PJ4B
-CPU_XSCALE_80200 CPU_XSCALE_80321
+CPU_FA526 CPU_XSCALE_80200 CPU_XSCALE_80321
 CPU_XSCALE_PXA250 CPU_XSCALE_PXA270
 CPU_XSCALE_IXP425 
 CPU_SHEEVA
 defflag	opt_cputypes.h		CPU_ARM1136: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM1176: CPU_ARM11
 defflag	opt_cputypes.h		CPU_ARM11MPCORE: CPU_ARM11
+defflag	opt_cputypes.h		CPU_PJ4B: CPU_ARMV7
+defflag	opt_cputypes.h		CPU_CORTEX: CPU_ARMV7
 defflag	opt_cputypes.h		CPU_CORTEXA5: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA7: CPU_CORTEX
 defflag	opt_cputypes.h		CPU_CORTEXA8: CPU_CORTEX



CVS commit: src/sys/arch/arm/conf

2013-02-13 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Feb 14 07:26:24 UTC 2013

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
Add BUSDMA_COUNTERS option


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.115 src/sys/arch/arm/conf/files.arm:1.116
--- src/sys/arch/arm/conf/files.arm:1.115	Mon Jan 28 06:14:45 2013
+++ src/sys/arch/arm/conf/files.arm	Thu Feb 14 07:26:23 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.115 2013/01/28 06:14:45 matt Exp $
+#	$NetBSD: files.arm,v 1.116 2013/02/14 07:26:23 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -45,7 +45,9 @@ defparam opt_arm_intr_impl.h	ARM_INTR_IM
 defflag	opt_arm_debug.h		ARM_LOCK_CAS_DEBUG
 
 # Board-specific bus_space(9)/bus_dma(9) definitions
-defflag  opt_arm_bus_space.h	__BUS_SPACE_HAS_STREAM_METHODS _ARM32_NEED_BUS_DMA_BOUNCE
+defflag  opt_arm_bus_space.h	__BUS_SPACE_HAS_STREAM_METHODS
+_ARM32_NEED_BUS_DMA_BOUNCE
+BUSDMA_COUNTERS
 
 # Floating point emulator
 obsolete defflagARMFPE



CVS commit: src/sys/arch/arm/conf

2013-02-02 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sun Feb  3 00:43:15 UTC 2013

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Always compile the kernel with -mfloat=soft


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.35 src/sys/arch/arm/conf/Makefile.arm:1.36
--- src/sys/arch/arm/conf/Makefile.arm:1.35	Fri Oct  5 01:39:45 2012
+++ src/sys/arch/arm/conf/Makefile.arm	Sun Feb  3 00:43:14 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.35 2012/10/05 01:39:45 matt Exp $
+#	$NetBSD: Makefile.arm,v 1.36 2013/02/03 00:43:14 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -35,6 +35,7 @@ GENASSYM_CONF=	${ARM}/arm32/genassym.cf
 # CPPFLAGS set by platform-specific Makefile fragment.
 AFLAGS+=	-x assembler-with-cpp
 COPTS.arm32_kvminit.c+=		-fno-stack-protector
+CFLAGS+=	 -mfloat=soft
 
 ##
 ## (3) libkern and compat



CVS commit: src/sys/arch/arm/conf

2013-01-28 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 28 19:31:15 UTC 2013

Modified Files:
src/sys/arch/arm/conf: majors.arm32

Log Message:
reserve char 111 for vchiq


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/conf/majors.arm32

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

Modified files:

Index: src/sys/arch/arm/conf/majors.arm32
diff -u src/sys/arch/arm/conf/majors.arm32:1.33 src/sys/arch/arm/conf/majors.arm32:1.34
--- src/sys/arch/arm/conf/majors.arm32:1.33	Thu Jun 30 20:09:20 2011
+++ src/sys/arch/arm/conf/majors.arm32	Mon Jan 28 19:31:14 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.arm32,v 1.33 2011/06/30 20:09:20 wiz Exp $
+#	$NetBSD: majors.arm32,v 1.34 2013/01/28 19:31:14 jmcneill Exp $
 #
 # Device majors for arm32
 #
@@ -104,6 +104,7 @@ device-major	epcom		char 107		epcom
 device-major	tslcd		char 108		tslcd
 device-major	twe		char 109  		twe
 device-major	nsmb		char 110		nsmb
+device-major	vchiq		char 111		vchiq
 
 # Majors up to 143 are reserved for machine-dependent drivers.
 # New machine-independent driver majors are assigned in 



CVS commit: src/sys/arch/arm/conf

2012-10-04 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Oct  5 01:39:45 UTC 2012

Modified Files:
src/sys/arch/arm/conf: Makefile.arm

Log Message:
Make arm32_kvminit.o is complied with -fno-stack-protector


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/conf/Makefile.arm

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

Modified files:

Index: src/sys/arch/arm/conf/Makefile.arm
diff -u src/sys/arch/arm/conf/Makefile.arm:1.34 src/sys/arch/arm/conf/Makefile.arm:1.35
--- src/sys/arch/arm/conf/Makefile.arm:1.34	Fri May 18 12:45:43 2012
+++ src/sys/arch/arm/conf/Makefile.arm	Fri Oct  5 01:39:45 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.arm,v 1.34 2012/05/18 12:45:43 skrll Exp $
+#	$NetBSD: Makefile.arm,v 1.35 2012/10/05 01:39:45 matt Exp $
 
 # Makefile for NetBSD
 #
@@ -34,6 +34,7 @@ GENASSYM_CONF=	${ARM}/arm32/genassym.cf
 ##
 # CPPFLAGS set by platform-specific Makefile fragment.
 AFLAGS+=	-x assembler-with-cpp
+COPTS.arm32_kvminit.c+=		-fno-stack-protector
 
 ##
 ## (3) libkern and compat



CVS commit: src/sys/arch/arm/conf

2012-09-17 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Tue Sep 18 05:09:47 UTC 2012

Modified Files:
src/sys/arch/arm/conf: files.arm

Log Message:
add _ARM32_NEED_BUS_DMA_BOUNCE to opt_arm_bus_space.h (It's not really a
bus_space option but it's close enough).


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/arm/conf/files.arm

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

Modified files:

Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.110 src/sys/arch/arm/conf/files.arm:1.111
--- src/sys/arch/arm/conf/files.arm:1.110	Wed Aug 29 23:16:35 2012
+++ src/sys/arch/arm/conf/files.arm	Tue Sep 18 05:09:47 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.110 2012/08/29 23:16:35 matt Exp $
+#	$NetBSD: files.arm,v 1.111 2012/09/18 05:09:47 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defflagARM32
@@ -44,8 +44,8 @@ defparam opt_arm_intr_impl.h	ARM_INTR_IM
 # ARM-specific debug options
 defflag	opt_arm_debug.h		ARM_LOCK_CAS_DEBUG
 
-# Board-specific bus_space(9) definitions
-defflag  opt_arm_bus_space.h	__BUS_SPACE_HAS_STREAM_METHODS
+# Board-specific bus_space(9)/bus_dma(9) definitions
+defflag  opt_arm_bus_space.h	__BUS_SPACE_HAS_STREAM_METHODS _ARM32_NEED_BUS_DMA_BOUNCE
 
 # Floating point emulator
 defflagARMFPE



CVS commit: src/sys/arch/arm/conf

2012-09-01 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  1 12:17:04 UTC 2012

Modified Files:
src/sys/arch/arm/conf: kern.ldscript.head

Log Message:
Add missing ;


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/conf/kern.ldscript.head

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

Modified files:

Index: src/sys/arch/arm/conf/kern.ldscript.head
diff -u src/sys/arch/arm/conf/kern.ldscript.head:1.3 src/sys/arch/arm/conf/kern.ldscript.head:1.4
--- src/sys/arch/arm/conf/kern.ldscript.head:1.3	Wed Aug 29 22:43:57 2012
+++ src/sys/arch/arm/conf/kern.ldscript.head	Sat Sep  1 12:17:04 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.head,v 1.3 2012/08/29 22:43:57 matt Exp $	*/
+/*	$NetBSD: kern.ldscript.head,v 1.4 2012/09/01 12:17:04 matt Exp $	*/
 
 OUTPUT_FORMAT(elf32-littlearm, elf32-bigarm,
 	  elf32-littlearm)
@@ -12,8 +12,8 @@ SECTIONS
   {
 *(.text)
 *(.text.*)
-__stub_start = .
+__stub_start = .;
 *(.stub)
-__stub_end = .
+__stub_end = .;
 *(.glue_7t) *(.glue_7)
 *(.rodata) *(.rodata.*)



CVS commit: src/sys/arch/arm/conf

2012-08-29 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Wed Aug 29 22:43:57 UTC 2012

Modified Files:
src/sys/arch/arm/conf: kern.ldscript.head

Log Message:
Add __stub_start and __stub_end symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/conf/kern.ldscript.head

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

Modified files:

Index: src/sys/arch/arm/conf/kern.ldscript.head
diff -u src/sys/arch/arm/conf/kern.ldscript.head:1.2 src/sys/arch/arm/conf/kern.ldscript.head:1.3
--- src/sys/arch/arm/conf/kern.ldscript.head:1.2	Sun Dec 11 12:16:45 2005
+++ src/sys/arch/arm/conf/kern.ldscript.head	Wed Aug 29 22:43:57 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern.ldscript.head,v 1.2 2005/12/11 12:16:45 christos Exp $	*/
+/*	$NetBSD: kern.ldscript.head,v 1.3 2012/08/29 22:43:57 matt Exp $	*/
 
 OUTPUT_FORMAT(elf32-littlearm, elf32-bigarm,
 	  elf32-littlearm)
@@ -12,6 +12,8 @@ SECTIONS
   {
 *(.text)
 *(.text.*)
+__stub_start = .
 *(.stub)
+__stub_end = .
 *(.glue_7t) *(.glue_7)
 *(.rodata) *(.rodata.*)



CVS commit: src/sys/arch/arm/conf

2010-11-30 Thread Hiroyuki Bessho
Module Name:src
Committed By:   bsh
Date:   Tue Nov 30 12:42:48 UTC 2010

Modified Files:
src/sys/arch/arm/conf: majors.arm32

Log Message:
define major device number for UARTs on i.MX SoCs


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/conf/majors.arm32

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

Modified files:

Index: src/sys/arch/arm/conf/majors.arm32
diff -u src/sys/arch/arm/conf/majors.arm32:1.31 src/sys/arch/arm/conf/majors.arm32:1.32
--- src/sys/arch/arm/conf/majors.arm32:1.31	Sat Mar  6 23:45:39 2010
+++ src/sys/arch/arm/conf/majors.arm32	Tue Nov 30 12:42:48 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: majors.arm32,v 1.31 2010/03/06 23:45:39 plunky Exp $
+#	$NetBSD: majors.arm32,v 1.32 2010/11/30 12:42:48 bsh Exp $
 #
 # Device majors for arm32
 #
@@ -97,6 +97,7 @@
 device-major	dmoverio	char 102		dmoverio
 device-major	apm		char 103		apm
 device-major	sscom		char 104		sscom
+device-major	imxcom		char 104		imxuart
 device-major	ksyms		char 105		ksyms
 device-major	isdnbchan	char 106		isdnbchan
 device-major	epcom		char 107		epcom