diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/cats/conf/GENERIC | 14 | ||||
| -rw-r--r-- | sys/arch/hp300/conf/GENERIC | 12 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/hppa64/conf/GENERIC | 13 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/luna88k/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/mac68k/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/mvme68k/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/GENERIC | 16 | ||||
| -rw-r--r-- | sys/arch/mvmeppc/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/sgi/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/solbourne/conf/GENERIC | 8 | ||||
| -rw-r--r-- | sys/arch/sparc/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/sparc64/conf/GENERIC | 22 | ||||
| -rw-r--r-- | sys/arch/vax/conf/GENERIC | 11 | ||||
| -rw-r--r-- | sys/arch/zaurus/conf/GENERIC | 12 |
19 files changed, 76 insertions, 125 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 283dfc454a8..d7131cbb5a9 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.144 2005/04/30 00:36:03 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.145 2005/04/30 00:49:35 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,10 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -machine alpha - -include "../../../conf/GENERIC" -maxusers 32 +machine alpha +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # CPU Support option DEC_3000_500 # Flamingo etc: 3000/[4-9]00* diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 8b81472f0ff..ebafba39564 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.61 2005/04/30 00:36:03 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.62 2005/04/30 00:49:35 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,9 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -machine amd64 # architecture, used by config; REQUIRED - -include "../../../conf/GENERIC" +machine amd64 +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users #option USER_PCICONF # user-space PCI configuration @@ -32,8 +32,6 @@ option APERTURE # in-kernel aperture driver for XFree86 #option NTFS # Experimental NTFS support -maxusers 32 # estimated number of users - config bsd swap generic mainbus0 at root diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC index 75c5e7e8a9a..9c02e0a3270 100644 --- a/sys/arch/cats/conf/GENERIC +++ b/sys/arch/cats/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.21 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.22 2005/04/30 00:49:35 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,19 +9,13 @@ # of each device driver in this file see the section 4 man page for the # device. -machine cats arm - -include "../../../conf/GENERIC" +machine cats arm +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users options ARM32 options FOOTBRIDGE_INTR -# estimated number of users - -maxusers 32 - -# Standard system options - #options UCONSOLE # users can use TIOCCONS (for xconsole) #options INSECURE # disable kernel securelevel diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index 06082f757f5..c5d76a3ff37 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.39 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.40 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,10 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -machine hp300 m68k - -# Include all GENERIC options -include "../../../conf/GENERIC" +machine hp300 m68k +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # Support for various CPU types option HP320 @@ -29,9 +28,6 @@ option HP400 option HP425 option HP433 -# Need to set locally -maxusers 32 - # Options for HP hardware option USELEDS # make the lights twinkle #option CONSCODE="9" # force console at this select code for DIO diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index de477e063cc..fb5b6d1f89e 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.69 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.70 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,10 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -# Machine architecture; required by config(8) machine hppa - -include "../../../conf/GENERIC" +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # Support for various CPU types option HP7000_CPU # PCXS @@ -32,9 +31,6 @@ option USER_PCICONF # user-space PCI configuration option COMPAT_HPUX #option COMPAT_LINUX -# Need to set locally -maxusers 32 - option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC index 61cd64990c1..74dc205b378 100644 --- a/sys/arch/hppa64/conf/GENERIC +++ b/sys/arch/hppa64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.2 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.3 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,17 +9,12 @@ # of each device driver in this file see the section 4 man page for the # device. -# Machine architecture; required by config(8) machine hppa64 +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users -include "../../../conf/GENERIC" -option DEBUG - +option DEBUG option USER_PCICONF # user-space PCI configuration - -# Need to set locally -maxusers 32 - option TIMEZONE=0 # time zone to adjust RTC time by option DST=0 # daylight saving time used by RTC diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index e0ca63656fc..95bca1bd31d 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.408 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.409 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,9 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -machine i386 # architecture, used by config; REQUIRED - -include "../../../conf/GENERIC" +machine i386 +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users option I386_CPU # CPU classes; at least one is REQUIRED option I486_CPU @@ -39,8 +39,6 @@ option COMPAT_AOUT # a.out binaries are emulated #option NTFS # Experimental NTFS support -maxusers 32 # estimated number of users - # or use root on nfs swap on nfs config bsd swap generic diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC index dd5d4758312..e6a6b1975bd 100644 --- a/sys/arch/luna88k/conf/GENERIC +++ b/sys/arch/luna88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.7 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.8 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -10,8 +10,8 @@ # device. machine luna88k m88k - -include "../../../conf/GENERIC" +include "../../../conf/GENERIC" +maxusers 64 # estimated number of users option "NCPUS=1" # number of CPUs supported (max 4) @@ -21,7 +21,6 @@ option M88100 # 88100 support; mandatory # Define this if your processor has the xxx.usr bug (mask C82N) option ERRATA__XXX_USR -maxusers 64 config bsd swap generic diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index d2500af1018..925c837aad7 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.38 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.39 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,8 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -machine mac68k m68k -include "conf/GENERIC" +machine mac68k m68k +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # Mac-specific options option HZ=60 # Macs like 60Hz @@ -24,7 +25,6 @@ option DISABLE_ADB_WITH_SERIAL_CONSOLE #option MRG_ADB # Use ROM-based ADB driver config bsd swap generic -maxusers 32 mainbus0 at root diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 1f057ea2adb..b0511ab8a8e 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.80 2005/04/30 00:36:04 deraadt Exp $g +# $OpenBSD: GENERIC,v 1.81 2005/04/30 00:49:36 deraadt Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -10,8 +10,8 @@ # device. machine macppc powerpc - -maxusers 32 +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # default type, instructs system to try to determin what proper type is # actual machine type probed via name of openfirmware root node. @@ -28,8 +28,6 @@ option WSDISPLAY_COMPAT_RAWKBD option USER_PCICONF # user-space PCI configuration -include "../../../conf/GENERIC" - config bsd swap generic mainbus0 at root diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC index d2135c85c5e..67476394ec7 100644 --- a/sys/arch/mvme68k/conf/GENERIC +++ b/sys/arch/mvme68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.23 2005/04/30 00:36:04 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.24 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -10,8 +10,8 @@ # device. machine mvme68k m68k - include "../../../conf/GENERIC" +maxusers 32 # estimated number of users option M68030 # support for 030 option M68040 # support for 040 @@ -30,8 +30,6 @@ option COMPAT_SUNOS option COMPAT_HPUX option COMPAT_M68K4K -maxusers 32 - config bsd swap generic mainbus0 at root diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index 15c0fcf0f92..dd00808f2fc 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.45 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.46 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -10,23 +10,21 @@ # device. machine mvme88k m88k - -include "../../../conf/GENERIC" +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # Processor type option M88100 option M88110 -option MVME187 # support for 187 (requires M88100) -option MVME188 # support for 188 (requires M88100) -option MVME197 # support for 197 (requires M88110) - -option "NCPUS=1" # number of CPUs supported (max 4) +option MVME187 # support for 187 (requires M88100) +option MVME188 # support for 188 (requires M88100) +option MVME197 # support for 197 (requires M88110) +option "NCPUS=1" # number of CPUs supported (max 4) # Define this if your processor has the xxx.usr bug (mask C82N) option ERRATA__XXX_USR -maxusers 64 config bsd swap generic diff --git a/sys/arch/mvmeppc/conf/GENERIC b/sys/arch/mvmeppc/conf/GENERIC index 9089a51d64d..3ab0bb284e1 100644 --- a/sys/arch/mvmeppc/conf/GENERIC +++ b/sys/arch/mvmeppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.7 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.8 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -10,8 +10,8 @@ # device. machine mvmeppc powerpc - -maxusers 32 +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # default type, instructs system to try to determine what proper type is # actual machine type probed via name of openfirmware root node. @@ -19,7 +19,6 @@ option SYS_TYPE=APPL option PCIVERBOSE -include "../../../conf/GENERIC" config bsd swap generic diff --git a/sys/arch/sgi/conf/GENERIC b/sys/arch/sgi/conf/GENERIC index e5b72ec8de6..9f1d91924d7 100644 --- a/sys/arch/sgi/conf/GENERIC +++ b/sys/arch/sgi/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.14 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.15 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -10,10 +10,8 @@ # device. machine sgi mips64 - -include "../../../conf/GENERIC" - -maxusers 32 +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users # Make options makeoption LINK_ADDRESS="0xffffffff80100000" diff --git a/sys/arch/solbourne/conf/GENERIC b/sys/arch/solbourne/conf/GENERIC index 287a5acd1e9..358de46af88 100644 --- a/sys/arch/solbourne/conf/GENERIC +++ b/sys/arch/solbourne/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.2 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.3 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,12 +9,10 @@ # of each device driver in this file see the section 4 man page for the # device. -# Machine architecture; required by config(8) machine solbourne sparc - -include "../../../conf/GENERIC" - +include "../../../conf/GENERIC" maxusers 32 # estimated number of users + option SOLBOURNE # necessary for proper config(8) operation # Generic swap; second partition of root disk or network. diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 40c4960bcdf..bad6c5112ec 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.81 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.82 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,11 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -# Machine architecture; required by config(8) machine sparc - -include "../../../conf/GENERIC" - +include "../../../conf/GENERIC" +maxusers 20 # estimated number of users # Options for variants of the Sun SPARC architecture. # At least one is required. @@ -31,8 +29,6 @@ option SUN4M # sun4m - SS10, SS20, Classic, etc. option COMPAT_SUNOS # compatibility with SunOS binaries option COMPAT_SVR4 # compatibility with SVR4 binaries -maxusers 20 # estimated number of users - # Generic swap; second partition of root disk or network. config bsd swap generic diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index 2bb71ea88cf..5264cc52841 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.123 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.124 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -10,18 +10,16 @@ # device. machine sparc64 - -include "../../../conf/GENERIC" +include "../../../conf/GENERIC" +maxusers 64 # estimated number of users option SUN4U option PCIVERBOSE -option USER_PCICONF # user-space PCI configuration +option USER_PCICONF # user-space PCI configuration option APERTURE option USBVERBOSE -maxusers 64 - config bsd swap generic # Main bus and CPU .. all systems. @@ -49,12 +47,12 @@ ebus* at pci? # PCI Ethernet hme* at pci? gem* at pci? -#ti* at pci? # Alteon Tigon 1Gb ethernet -fxp* at pci? # EtherExpress 10/100B ethernet -xl* at pci? # 3C9xx ethernet -dc* at pci? # 21143, "tulip" clone ethernet -em* at pci? # Intel Pro/1000 ethernet -rl* at pci? # RealTek 81[23]9 ethernet +#ti* at pci? # Alteon Tigon 1Gb ethernet +fxp* at pci? # EtherExpress 10/100B ethernet +xl* at pci? # 3C9xx ethernet +dc* at pci? # 21143, "tulip" clone ethernet +em* at pci? # Intel Pro/1000 ethernet +rl* at pci? # RealTek 81[23]9 ethernet vr* at pci? # VIA Rhine ethernet # PCI SCSI diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index 6d418e4e558..18c6790bead 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.37 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.38 2005/04/30 00:49:36 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,9 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -machine vax # machine type; required - -include "../../../conf/GENERIC" +machine vax +include "../../../conf/GENERIC" +maxusers 8 # estimated number of users # Here are all different supported CPU types listed. # One of these is required. @@ -31,9 +31,6 @@ option VAX48 # VS 4000 VLC option VAX49 # VS 4000/90 option VAX53 # VAX 4000 10X, MicroVAX 3100m9X -# Max users on system; this is just a hint -maxusers 8 - option SCSIVERBOSE # Verbose SCSI errors # Old compat stuff; needed to run 4.3BSD Reno programs. diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 1a0df0d674c..167a307a09a 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.34 2005/04/30 00:36:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.35 2005/04/30 00:49:37 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -9,9 +9,9 @@ # of each device driver in this file see the section 4 man page for the # device. -machine zaurus arm - -include "../../../conf/GENERIC" +machine zaurus arm +include "../../../conf/GENERIC" +maxusers 32 # estimated number of users options ARM32 #options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>" @@ -26,10 +26,6 @@ makeoptions BOARDTYPE="zaurus" options APERTURE -# estimated number of users - -maxusers 32 - # CPU options options CPU_XSCALE_PXA2X0 # Support the XScale core #options XSCALE_CACHE_WRITE_THROUGH |