Module Name: src
Committed By: msaitoh
Date: Thu Dec 6 06:25:25 UTC 2012
Modified Files:
src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC
src/sys/arch/cats/conf: GENERIC INSTALL
src/sys/arch/hpcarm/conf: IPAQ JORNADA720 JORNADA820
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/shark/conf: GENERIC INSTALL OFWGENCFG
Log Message:
Remove "#options ARMFPE"
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/acorn32/conf/EB7500ATX
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/acorn32/conf/INSTALL
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/acorn32/conf/LOWMEM_WSCONS
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/acorn32/conf/NC
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/cats/conf/INSTALL
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/hpcarm/conf/IPAQ
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/hpcarm/conf/JORNADA720
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcarm/conf/JORNADA820
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/shark/conf/INSTALL
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/shark/conf/OFWGENCFG
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/acorn32/conf/EB7500ATX
diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.48 src/sys/arch/acorn32/conf/EB7500ATX:1.49
--- src/sys/arch/acorn32/conf/EB7500ATX:1.48 Fri Aug 17 20:11:37 2012
+++ src/sys/arch/acorn32/conf/EB7500ATX Thu Dec 6 06:25:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.48 2012/08/17 20:11:37 abs Exp $
+# $NetBSD: EB7500ATX,v 1.49 2012/12/06 06:25:24 msaitoh Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.48 $"
+#ident "EB7500ATX-$Revision: 1.49 $"
# estimated number of users
maxusers 32
@@ -35,9 +35,6 @@ options RTC_OFFSET=0 # hardware clock i
# CPU options
options CPU_ARM7 # Support the ARM7 core
-# FPA options
-#options ARMFPE # ARM Ltd FPE
-
options EB7500ATX # Define in case needed
# File systems
Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.104 src/sys/arch/acorn32/conf/GENERIC:1.105
--- src/sys/arch/acorn32/conf/GENERIC:1.104 Wed Oct 17 14:48:07 2012
+++ src/sys/arch/acorn32/conf/GENERIC Thu Dec 6 06:25:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.104 2012/10/17 14:48:07 apb Exp $
+# $NetBSD: GENERIC,v 1.105 2012/12/06 06:25:24 msaitoh Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.104 $"
+#ident "GENERIC-$Revision: 1.105 $"
# estimated number of users
maxusers 32
@@ -42,9 +42,6 @@ options CPU_ARM7 # Support the ARM7 cor
# For StrongARM only kernels
#makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm"
-# FPA options
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/acorn32/conf/INSTALL
diff -u src/sys/arch/acorn32/conf/INSTALL:1.63 src/sys/arch/acorn32/conf/INSTALL:1.64
--- src/sys/arch/acorn32/conf/INSTALL:1.63 Fri Aug 17 20:11:37 2012
+++ src/sys/arch/acorn32/conf/INSTALL Thu Dec 6 06:25:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.63 2012/08/17 20:11:37 abs Exp $
+# $NetBSD: INSTALL,v 1.64 2012/12/06 06:25:24 msaitoh Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.63 $"
+#ident "INSTALL-$Revision: 1.64 $"
# estimated number of users
maxusers 32
@@ -42,9 +42,6 @@ options CPU_ARM7 # Support the ARM7 cor
# For StrongARM only kernels
#makeoptions COPTS="-O2 -march=armv3m -mtune=strongarm"
-# FPA options
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/acorn32/conf/LOWMEM_WSCONS
diff -u src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.58 src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.59
--- src/sys/arch/acorn32/conf/LOWMEM_WSCONS:1.58 Fri Aug 17 20:11:37 2012
+++ src/sys/arch/acorn32/conf/LOWMEM_WSCONS Thu Dec 6 06:25:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.58 2012/08/17 20:11:37 abs Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.59 2012/12/06 06:25:24 msaitoh Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -29,10 +29,6 @@ options CPU_ARM7 # Support the ARM7 cor
# For small kernels
makeoptions COPTS="-Os -fno-inline -Dinline= -D__inline__= -D_inline_= "
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/acorn32/conf/NC
diff -u src/sys/arch/acorn32/conf/NC:1.56 src/sys/arch/acorn32/conf/NC:1.57
--- src/sys/arch/acorn32/conf/NC:1.56 Fri Aug 17 20:11:37 2012
+++ src/sys/arch/acorn32/conf/NC Thu Dec 6 06:25:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.56 2012/08/17 20:11:37 abs Exp $
+# $NetBSD: NC,v 1.57 2012/12/06 06:25:24 msaitoh Exp $
#
# NC - with wscons
#
@@ -23,10 +23,6 @@ options CPU_ARM7 # Support the ARM7 cor
#options CPU_ARM8 # Support the ARM8 core
#options ARM6_LATE_ABORT # ARM6XX late abort support
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
#file-system FFS # UFS
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.141 src/sys/arch/cats/conf/GENERIC:1.142
--- src/sys/arch/cats/conf/GENERIC:1.141 Wed Oct 17 14:48:09 2012
+++ src/sys/arch/cats/conf/GENERIC Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.141 2012/10/17 14:48:09 apb Exp $
+# $NetBSD: GENERIC,v 1.142 2012/12/06 06:25:25 msaitoh Exp $
#
# GENERIC machine description file
#
@@ -50,10 +50,6 @@ makeoptions CPUFLAGS="-march=armv4 -mtun
#options VERBOSE_INIT_ARM
#options FCOM_INIT_ARM # early console attach
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/cats/conf/INSTALL
diff -u src/sys/arch/cats/conf/INSTALL:1.82 src/sys/arch/cats/conf/INSTALL:1.83
--- src/sys/arch/cats/conf/INSTALL:1.82 Tue Jun 5 08:44:08 2012
+++ src/sys/arch/cats/conf/INSTALL Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.82 2012/06/05 08:44:08 abs Exp $
+# $NetBSD: INSTALL,v 1.83 2012/12/06 06:25:25 msaitoh Exp $
#
# CATSINST -- CHALTECH CATS Install kernel
#
@@ -24,10 +24,6 @@ options RTC_OFFSET=0 # hardware clock i
options CPU_SA110 # Support the SA110 core
makeoptions COPTS="-Os -march=armv4 -mtune=strongarm" # optimise for space
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/hpcarm/conf/IPAQ
diff -u src/sys/arch/hpcarm/conf/IPAQ:1.68 src/sys/arch/hpcarm/conf/IPAQ:1.69
--- src/sys/arch/hpcarm/conf/IPAQ:1.68 Sat Mar 10 21:51:52 2012
+++ src/sys/arch/hpcarm/conf/IPAQ Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: IPAQ,v 1.68 2012/03/10 21:51:52 joerg Exp $
+# $NetBSD: IPAQ,v 1.69 2012/12/06 06:25:25 msaitoh Exp $
#
# iPAQ H3600 -- Windows-CE based PDA
#
@@ -23,9 +23,6 @@ options CPU_SA1110 # Support the SA1110
# Architecture options
options SAEGPIO_BASE="0x49000000"
# we have Extended GPIO
-# FPA options
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/hpcarm/conf/JORNADA720
diff -u src/sys/arch/hpcarm/conf/JORNADA720:1.87 src/sys/arch/hpcarm/conf/JORNADA720:1.88
--- src/sys/arch/hpcarm/conf/JORNADA720:1.87 Fri Aug 17 19:43:25 2012
+++ src/sys/arch/hpcarm/conf/JORNADA720 Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA720,v 1.87 2012/08/17 19:43:25 abs Exp $
+# $NetBSD: JORNADA720,v 1.88 2012/12/06 06:25:25 msaitoh Exp $
#
# JORNADA -- Windows-CE based jornada 720
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.87 $"
+#ident "GENERIC-$Revision: 1.88 $"
# estimated number of users
maxusers 32
@@ -24,10 +24,6 @@ options CPU_SA1110 # Support the SA-111
# Architecture options
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/hpcarm/conf/JORNADA820
diff -u src/sys/arch/hpcarm/conf/JORNADA820:1.27 src/sys/arch/hpcarm/conf/JORNADA820:1.28
--- src/sys/arch/hpcarm/conf/JORNADA820:1.27 Fri Aug 17 19:43:25 2012
+++ src/sys/arch/hpcarm/conf/JORNADA820 Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA820,v 1.27 2012/08/17 19:43:25 abs Exp $
+# $NetBSD: JORNADA820,v 1.28 2012/12/06 06:25:25 msaitoh Exp $
#
# JORNADA -- Windows-CE based jornada 820
#
@@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.sa11x0"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.27 $"
+#ident "GENERIC-$Revision: 1.28 $"
# estimated number of users
maxusers 32
@@ -24,10 +24,6 @@ options CPU_SA1100 # Support the SA1100
# Architecture options
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
#file-system FFS # UFS
Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.113 src/sys/arch/netwinder/conf/GENERIC:1.114
--- src/sys/arch/netwinder/conf/GENERIC:1.113 Wed Oct 17 14:48:14 2012
+++ src/sys/arch/netwinder/conf/GENERIC Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113 2012/10/17 14:48:14 apb Exp $
+# $NetBSD: GENERIC,v 1.114 2012/12/06 06:25:25 msaitoh Exp $
#
# GENERIC machine description file
#
@@ -42,10 +42,6 @@ options RTC_OFFSET=0 # hardware clock i
options CPU_SA110 # Support the SA110 core
makeoptions CPUFLAGS="-march=armv4 -mtune=strongarm"
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# Default console is wscons, if igsfb(4) and pckbc(4) are configured,
# or com(4) otherwise. You can force a serial console with these options
#options CONSDEVNAME="\"com\"",CONCOMADDR=0x3f8,CONSPEED=115200
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.103 src/sys/arch/shark/conf/GENERIC:1.104
--- src/sys/arch/shark/conf/GENERIC:1.103 Wed Oct 17 14:48:16 2012
+++ src/sys/arch/shark/conf/GENERIC Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.103 2012/10/17 14:48:16 apb Exp $
+# $NetBSD: GENERIC,v 1.104 2012/12/06 06:25:25 msaitoh Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.103 $"
+#ident "GENERIC-$Revision: 1.104 $"
# estimated number of users
maxusers 32
@@ -33,10 +33,6 @@ makeoptions CPUFLAGS="-march=armv4 -mtun
# properties and/or may set up devices incorrectly.
options COMPAT_OLD_OFW
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/shark/conf/INSTALL
diff -u src/sys/arch/shark/conf/INSTALL:1.50 src/sys/arch/shark/conf/INSTALL:1.51
--- src/sys/arch/shark/conf/INSTALL:1.50 Tue Jun 5 08:44:15 2012
+++ src/sys/arch/shark/conf/INSTALL Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.50 2012/06/05 08:44:15 abs Exp $
+# $NetBSD: INSTALL,v 1.51 2012/12/06 06:25:25 msaitoh Exp $
#
# Shark installation kernel
#
@@ -32,10 +32,6 @@ options NSIO # We are using the Nation
# properties and/or may set up devices incorrectly.
options COMPAT_OLD_OFW
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
Index: src/sys/arch/shark/conf/OFWGENCFG
diff -u src/sys/arch/shark/conf/OFWGENCFG:1.38 src/sys/arch/shark/conf/OFWGENCFG:1.39
--- src/sys/arch/shark/conf/OFWGENCFG:1.38 Tue Nov 22 21:25:36 2011
+++ src/sys/arch/shark/conf/OFWGENCFG Thu Dec 6 06:25:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: OFWGENCFG,v 1.38 2011/11/22 21:25:36 tls Exp $
+# $NetBSD: OFWGENCFG,v 1.39 2012/12/06 06:25:25 msaitoh Exp $
#
# OFWGENCFG: 'generic' configuration for Open Firmware boards.
#
@@ -29,10 +29,6 @@ makeoptions COPTS="-O2 -march=armv4 -mtu
options OFWGENCFG # Enable Open Firmware bits specific to GENERIC configuration
-# FPA options
-
-#options ARMFPE # ARM Ltd FPE
-
# File systems
file-system FFS # UFS
