From 5d9d9e5cdabda4ff58be62c7955d081cad7a5b10 Mon Sep 17 00:00:00 2001 From: fvdl Date: Fri, 15 Nov 1996 09:19:31 +0000 Subject: [PATCH] Move non-optional options to std.i386, and use that file. --- sys/arch/i386/conf/BOAT_ANCHOR | 9 ++------- sys/arch/i386/conf/DISKLESS | 8 ++------ sys/arch/i386/conf/GENERIC | 8 ++------ sys/arch/i386/conf/GENERICADP | 8 ++------ sys/arch/i386/conf/GENERICOTHER | 8 ++------ sys/arch/i386/conf/HOMEWORLD | 8 ++------ sys/arch/i386/conf/INSTADP | 8 ++------ sys/arch/i386/conf/INSTALL | 8 ++------ sys/arch/i386/conf/INSTOTHER | 8 ++------ sys/arch/i386/conf/KICKME | 9 ++------- sys/arch/i386/conf/SUN_LAMP | 8 ++------ sys/arch/i386/conf/WARPED | 8 ++------ sys/arch/i386/conf/std.i386 | 10 ++++++++++ 13 files changed, 34 insertions(+), 74 deletions(-) create mode 100644 sys/arch/i386/conf/std.i386 diff --git a/sys/arch/i386/conf/BOAT_ANCHOR b/sys/arch/i386/conf/BOAT_ANCHOR index 3202987e1cf1..b38e64a88604 100644 --- a/sys/arch/i386/conf/BOAT_ANCHOR +++ b/sys/arch/i386/conf/BOAT_ANCHOR @@ -1,21 +1,19 @@ -# $NetBSD: BOAT_ANCHOR,v 1.68 1996/10/02 23:15:58 mycroft Exp $ +# $NetBSD: BOAT_ANCHOR,v 1.69 1996/11/15 09:19:31 fvdl Exp $ # # BOAT_ANCHOR -- kernel for the 386-20 the gang uses for testing # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE -options MACHINE_NONCONTIG maxusers 10 # estimated number of users options TIMEZONE=480 # time zone to adjust RTC time by options DST=1 # daylight savings time used by RTC -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -29,9 +27,6 @@ options COMPAT_11 # NetBSD 1.1, options COMPAT_12 options COMPAT_43 # and 4.3BSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) - options FFS # UFS and quotas options NFSCLIENT # Network File System client diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 5e7196390093..2506e2310096 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,11 +1,11 @@ -# $NetBSD: DISKLESS,v 1.32 1996/11/13 00:09:57 mikel Exp $ +# $NetBSD: DISKLESS,v 1.33 1996/11/15 09:19:32 fvdl Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) # and will use NFS for root and swap. (No local disk space needed.) # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -21,14 +21,12 @@ options MATH_EMULATE # floating point emulation #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -55,8 +53,6 @@ options COMPAT_SVR4 # binary compatibility with SVR4 #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index b1b570e8e570..0bdc63c9880b 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.60 1996/10/02 23:56:43 mycroft Exp $ +# $NetBSD: GENERIC,v 1.61 1996/11/15 09:19:33 fvdl Exp $ # # GENERIC -- everything that's currently supported # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -19,14 +19,12 @@ options MATH_EMULATE # floating point emulation #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -53,8 +51,6 @@ options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/GENERICADP b/sys/arch/i386/conf/GENERICADP index a416d726e308..b798b27a7281 100644 --- a/sys/arch/i386/conf/GENERICADP +++ b/sys/arch/i386/conf/GENERICADP @@ -1,10 +1,10 @@ -# $NetBSD: GENERICADP,v 1.32 1996/10/02 23:56:44 mycroft Exp $ +# $NetBSD: GENERICADP,v 1.33 1996/11/15 09:19:33 fvdl Exp $ # # GENERICADP -- everything that's currently supported, except non- # Adaptec SCSI controllers. # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -20,14 +20,12 @@ options MATH_EMULATE # floating point emulation #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -54,8 +52,6 @@ options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/GENERICOTHER b/sys/arch/i386/conf/GENERICOTHER index 73f63f7c16dc..0e4a33aa2f44 100644 --- a/sys/arch/i386/conf/GENERICOTHER +++ b/sys/arch/i386/conf/GENERICOTHER @@ -1,10 +1,10 @@ -# $NetBSD: GENERICOTHER,v 1.30 1996/10/02 23:56:45 mycroft Exp $ +# $NetBSD: GENERICOTHER,v 1.31 1996/11/15 09:19:34 fvdl Exp $ # # GENERICOTHER -- everything that's currently supported, except # Adaptec SCSI controllers. # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -20,14 +20,12 @@ options MATH_EMULATE # floating point emulation #options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -54,8 +52,6 @@ options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/HOMEWORLD b/sys/arch/i386/conf/HOMEWORLD index 08e226e52712..cbb9c46ecd23 100644 --- a/sys/arch/i386/conf/HOMEWORLD +++ b/sys/arch/i386/conf/HOMEWORLD @@ -1,9 +1,9 @@ -# $NetBSD: HOMEWORLD,v 1.4 1996/10/02 23:56:47 mycroft Exp $ +# $NetBSD: HOMEWORLD,v 1.5 1996/11/15 09:19:35 fvdl Exp $ # # HOMEWORLD - Mail, CVS, and GNATS server # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" #options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU # CPU classes; at least one is REQUIRED @@ -19,14 +19,12 @@ options I486_CPU # CPU classes; at least one is REQUIRED options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE #options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -53,8 +51,6 @@ options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) #options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/INSTADP b/sys/arch/i386/conf/INSTADP index 62316f433087..873ad0a0cfae 100644 --- a/sys/arch/i386/conf/INSTADP +++ b/sys/arch/i386/conf/INSTADP @@ -1,4 +1,4 @@ -# $NetBSD: INSTADP,v 1.26 1996/10/02 23:56:48 mycroft Exp $ +# $NetBSD: INSTADP,v 1.27 1996/11/15 09:19:36 fvdl Exp $ # # INSTADP -- like GENERICADP. This supports only Adaptec SCSI # adapters. This kernel is GENERICADP with lines @@ -7,7 +7,7 @@ # Install kernels no longer support X. # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -23,14 +23,12 @@ options MATH_EMULATE # floating point emulation #options DUMMY_NOPS # speed hack; recommended #options XSERVER,UCONSOLE #options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -57,8 +55,6 @@ options COMPAT_12 # NetBSD 1.2, #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) #options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL index 8885b802c141..33f2191862c5 100644 --- a/sys/arch/i386/conf/INSTALL +++ b/sys/arch/i386/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.24 1996/10/02 23:56:48 mycroft Exp $ +# $NetBSD: INSTALL,v 1.25 1996/11/15 09:19:37 fvdl Exp $ # # INSTOTHER -- like GENERICOTHER. This supports only non-Adaptec SCSI # adapters. This kernel is GENERICOTHER with lines @@ -7,7 +7,7 @@ # Install kernels no longer support X. # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -23,14 +23,12 @@ options MATH_EMULATE # floating point emulation #options DUMMY_NOPS # speed hack; recommended #options XSERVER,UCONSOLE #options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -57,8 +55,6 @@ options COMPAT_12 # NetBSD 1.2, #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) #options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/INSTOTHER b/sys/arch/i386/conf/INSTOTHER index 371750e2ea93..8e9c608104ac 100644 --- a/sys/arch/i386/conf/INSTOTHER +++ b/sys/arch/i386/conf/INSTOTHER @@ -1,4 +1,4 @@ -# $NetBSD: INSTOTHER,v 1.24 1996/10/02 23:56:48 mycroft Exp $ +# $NetBSD: INSTOTHER,v 1.25 1996/11/15 09:19:37 fvdl Exp $ # # INSTOTHER -- like GENERICOTHER. This supports only non-Adaptec SCSI # adapters. This kernel is GENERICOTHER with lines @@ -7,7 +7,7 @@ # Install kernels no longer support X. # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -23,14 +23,12 @@ options MATH_EMULATE # floating point emulation #options DUMMY_NOPS # speed hack; recommended #options XSERVER,UCONSOLE #options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 32 # estimated number of users options TIMEZONE=0 # time zone to adjust RTC time by options DST=0 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -57,8 +55,6 @@ options COMPAT_12 # NetBSD 1.2, #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) #options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/KICKME b/sys/arch/i386/conf/KICKME index 13ba232adc64..e65ec105e1a5 100644 --- a/sys/arch/i386/conf/KICKME +++ b/sys/arch/i386/conf/KICKME @@ -1,9 +1,9 @@ -# $NetBSD: KICKME,v 1.34 1996/10/02 23:15:58 mycroft Exp $ +# $NetBSD: KICKME,v 1.35 1996/11/15 09:19:37 fvdl Exp $ # # KICKME -- 486Cx-33 development machine # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" #options COMCONSOLE=0 #options COMADDR=0x3f8 @@ -18,13 +18,11 @@ options I486_CPU #options DUMMY_NOPS # speed hack; recommended #options XSERVER,UCONSOLE -options MACHINE_NONCONTIG maxusers 10 # estimated number of users options TIMEZONE=480 # time zone to adjust RTC time by options DST=1 # daylight savings time used by RTC -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -38,9 +36,6 @@ options COMPAT_11 # NetBSD 1.1, options COMPAT_12 options COMPAT_43 # and 4.3BSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) - options FFS # UFS options NFSCLIENT # Network File System client diff --git a/sys/arch/i386/conf/SUN_LAMP b/sys/arch/i386/conf/SUN_LAMP index 501a9af5ef40..b10de285abf0 100644 --- a/sys/arch/i386/conf/SUN_LAMP +++ b/sys/arch/i386/conf/SUN_LAMP @@ -1,9 +1,9 @@ -# $NetBSD: SUN_LAMP,v 1.77 1996/10/02 23:15:59 mycroft Exp $ +# $NetBSD: SUN_LAMP,v 1.78 1996/11/15 09:19:38 fvdl Exp $ # # SUN_LAMP -- kernel for one of cgd's 486/50 EISA boxes... # -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" #options I386_CPU # CPU classes; at least one is REQUIRED options I486_CPU @@ -17,13 +17,11 @@ options I486_CPU options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE -options MACHINE_NONCONTIG maxusers 24 # estimated number of users options TIMEZONE=480 # time zone to adjust RTC time by options DST=1 # daylight savings time used by RTC -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -47,8 +45,6 @@ options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD #options COMPAT_SVR4 # binary compatibility with SVR4 #options COMPAT_IBCS2 # binary compatibility with SCO and ISC -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) #options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/WARPED b/sys/arch/i386/conf/WARPED index 8052a9af3cbe..0fe047c38e4e 100644 --- a/sys/arch/i386/conf/WARPED +++ b/sys/arch/i386/conf/WARPED @@ -1,4 +1,4 @@ -# $NetBSD: WARPED,v 1.10 1996/10/02 23:56:49 mycroft Exp $ +# $NetBSD: WARPED,v 1.11 1996/11/15 09:19:39 fvdl Exp $ # # WARPED - ftp/sup.netbsd.org server machine # @@ -7,7 +7,7 @@ # Also: Adaptec PCI 2940 SCSI, DEC 21040 PCI Ethernet, Mach 64 PCI 2M Video, # Intel Pentium Overdrive, 40M RAM, 2 Maxtor 1.2G Magik, Conner 2G tape. -machine i386 # architecture, used by config; REQUIRED +include "arch/i386/conf/std.i386" #options I386_CPU # CPU classes; at least one is REQUIRED #options I486_CPU @@ -23,14 +23,12 @@ options I586_CPU # 83MHz P24T options DUMMY_NOPS # speed hack; recommended options XSERVER,UCONSOLE #options INSECURE # insecure; allow /dev/mem writing for X -options MACHINE_NONCONTIG maxusers 64 # estimated number of users options TIMEZONE=480 # time zone to adjust RTC time by options DST=1 # daylight savings time used by RTC #options NTP # NTP phase/frequency locked loop -options SWAPPAGER # paging; REQUIRED options VNODEPAGER # mmap() of files options DEVPAGER # mmap() of devices @@ -57,8 +55,6 @@ options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD #options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD -options EXEC_SCRIPT # #! scripts -options EXEC_AOUT # a.out executables (native, BSD/OS, Linux, FreeBSD) #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) #options USER_LDT # user-settable LDT; used by WINE diff --git a/sys/arch/i386/conf/std.i386 b/sys/arch/i386/conf/std.i386 new file mode 100644 index 000000000000..cf5d10cc66ee --- /dev/null +++ b/sys/arch/i386/conf/std.i386 @@ -0,0 +1,10 @@ +# $NetBSD: std.i386,v 1.6 1996/11/15 09:19:40 fvdl Exp $ +# +# standard, required NetBSD/i386 'options' + +machine i386 + +options SWAPPAGER # paging + +options EXEC_AOUT # exec a.out binaries +options EXEC_SCRIPT # exec #! scripts