From 4d36fbdfa1216deee9c196f655057e61a306970c Mon Sep 17 00:00:00 2001 From: mycroft Date: Wed, 8 Oct 1997 10:09:36 +0000 Subject: [PATCH] Clump USER_LDT with other CPU-related options. --- sys/arch/i386/conf/DISKLESS | 6 +++--- sys/arch/i386/conf/GENERIC | 6 +++--- sys/arch/i386/conf/HOMEWORLD | 8 ++++---- sys/arch/i386/conf/INSTALL | 6 +++--- sys/arch/i386/conf/KICKME | 7 +++---- sys/arch/i386/conf/SUN_LAMP | 4 ++-- sys/arch/i386/conf/WARPED | 8 ++++---- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 70157ecdb0f6..88236c9760cf 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.47 1997/10/08 09:32:36 mycroft Exp $ +# $NetBSD: DISKLESS,v 1.48 1997/10/08 10:09:36 mycroft Exp $ # # DISKLESS -- Generic machine setup for diskless boot. # This kernel can be loaded from a bootable floppy (i.e. kernel-copy) @@ -12,7 +12,8 @@ options I486_CPU options I586_CPU options I686_CPU options MATH_EMULATE # floating point emulation -#options VM86 # Virtual 8086 emulation +#options VM86 # virtual 8086 emulation +options USER_LDT # user-settable LDT; used by WINE # The following options override the memory sizes passed in from the boot # block. Use them *only* if the boot block is unable to determine the correct @@ -58,7 +59,6 @@ options COMPAT_SVR4 # binary compatibility with SVR4 options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) -options USER_LDT # user-settable LDT; used by WINE options LKM # loadable kernel modules #file-system FFS # UFS diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index a3d1e19fb410..a4916ad08fcb 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.101 1997/10/08 09:32:37 mycroft Exp $ +# $NetBSD: GENERIC,v 1.102 1997/10/08 10:09:38 mycroft Exp $ # # GENERIC -- everything that's currently supported # @@ -10,7 +10,8 @@ options I486_CPU options I586_CPU options I686_CPU options MATH_EMULATE # floating point emulation -#options VM86 # Virtual 8086 emulation +#options VM86 # virtual 8086 emulation +options USER_LDT # user-settable LDT; used by WINE # The following options override the memory sizes passed in from the boot # block. Use them *only* if the boot block is unable to determine the correct @@ -56,7 +57,6 @@ options COMPAT_FREEBSD # binary compatibility with FreeBSD options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) -options USER_LDT # user-settable LDT; used by WINE options LKM # loadable kernel modules file-system FFS # UFS diff --git a/sys/arch/i386/conf/HOMEWORLD b/sys/arch/i386/conf/HOMEWORLD index 812649a58b75..72f96a4d8b16 100644 --- a/sys/arch/i386/conf/HOMEWORLD +++ b/sys/arch/i386/conf/HOMEWORLD @@ -1,4 +1,4 @@ -# $NetBSD: HOMEWORLD,v 1.19 1997/10/08 09:32:38 mycroft Exp $ +# $NetBSD: HOMEWORLD,v 1.20 1997/10/08 10:09:39 mycroft Exp $ # # HOMEWORLD - Mail, CVS, and GNATS server # @@ -6,11 +6,12 @@ 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 +options I486_CPU #options I586_CPU #options I686_CPU #options MATH_EMULATE # floating point emulation -#options VM86 # Virtual 8086 emulation +#options VM86 # virtual 8086 emulation +#options USER_LDT # user-settable LDT; used by WINE # The following options override the memory sizes passed in from the boot # block. Use them *only* if the boot block is unable to determine the correct @@ -53,7 +54,6 @@ options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) -#options USER_LDT # user-settable LDT; used by WINE #options LKM # loadable kernel modules file-system FFS # UFS diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL index 448f30f5e836..0b08a96dc51c 100644 --- a/sys/arch/i386/conf/INSTALL +++ b/sys/arch/i386/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.49 1997/10/08 09:32:39 mycroft Exp $ +# $NetBSD: INSTALL,v 1.50 1997/10/08 10:09:40 mycroft Exp $ # # INSTALL -- an installation kernel config. # This kernel should be derived from GENERIC with ramdisk @@ -14,7 +14,8 @@ options I486_CPU options I586_CPU options I686_CPU options MATH_EMULATE # floating point emulation -#options VM86 # Virtual 8086 emulation +#options VM86 # virtual 8086 emulation +#options USER_LDT # user-settable LDT; used by WINE # The following options override the memory sizes passed in from the boot # block. Use them *only* if the boot block is unable to determine the correct @@ -67,7 +68,6 @@ options COMPAT_12 # NetBSD 1.2, #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) -#options USER_LDT # user-settable LDT; used by WINE options LKM # loadable kernel modules file-system FFS # UFS diff --git a/sys/arch/i386/conf/KICKME b/sys/arch/i386/conf/KICKME index 7f1b18dc8abe..54c64164e120 100644 --- a/sys/arch/i386/conf/KICKME +++ b/sys/arch/i386/conf/KICKME @@ -1,4 +1,4 @@ -# $NetBSD: KICKME,v 1.42 1997/06/25 04:41:19 mellon Exp $ +# $NetBSD: KICKME,v 1.43 1997/10/08 10:09:42 mycroft Exp $ # # KICKME -- 486Cx-33 development machine # @@ -8,7 +8,8 @@ include "arch/i386/conf/std.i386" maxusers 24 # estimated number of users options I486_CPU -options VM86 # Virtual 8086 emulation +options VM86 # virtual 8086 emulation +options USER_LDT # user-settable LDT; used by WINE options XSERVER options UCONSOLE @@ -34,8 +35,6 @@ options COMPAT_LINUX # binary compatibility with Linux options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) -options USER_LDT # user-settable LDT; used by WINE - file-system FFS # UFS file-system NFS # Network File System client file-system CD9660 # ISO 9660 + Rock Ridge file system diff --git a/sys/arch/i386/conf/SUN_LAMP b/sys/arch/i386/conf/SUN_LAMP index ae4beedab937..3df50868ff37 100644 --- a/sys/arch/i386/conf/SUN_LAMP +++ b/sys/arch/i386/conf/SUN_LAMP @@ -1,4 +1,4 @@ -# $NetBSD: SUN_LAMP,v 1.90 1997/10/08 09:32:40 mycroft Exp $ +# $NetBSD: SUN_LAMP,v 1.91 1997/10/08 10:09:43 mycroft Exp $ # # SUN_LAMP -- kernel for one of cgd's 486/50 EISA boxes... # @@ -10,6 +10,7 @@ options I486_CPU #options I586_CPU #options I686_CPU #options MATH_EMULATE # floating point emulation +#options USER_LDT # user-settable LDT; used by WINE # The following options override the memory sizes passed in from the boot # block. Use them *only* if the boot block is unable to determine the correct @@ -47,7 +48,6 @@ options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) -#options USER_LDT # user-settable LDT; used by WINE options LKM # loadable kernel modules options INSECURE diff --git a/sys/arch/i386/conf/WARPED b/sys/arch/i386/conf/WARPED index c1108d684938..a7b11f45c163 100644 --- a/sys/arch/i386/conf/WARPED +++ b/sys/arch/i386/conf/WARPED @@ -1,4 +1,4 @@ -# $NetBSD: WARPED,v 1.25 1997/10/08 09:32:40 mycroft Exp $ +# $NetBSD: WARPED,v 1.26 1997/10/08 10:09:44 mycroft Exp $ # # WARPED - ftp/sup.netbsd.org server machine # @@ -11,10 +11,11 @@ include "arch/i386/conf/std.i386" #options I386_CPU # CPU classes; at least one is REQUIRED #options I486_CPU -options I586_CPU # 83MHz P24T +options I586_CPU #options I686_CPU #options MATH_EMULATE # floating point emulation -#options VM86 # Virtual 8086 emulation +#options VM86 # virtual 8086 emulation +#options USER_LDT # user-settable LDT; used by WINE # The following options override the memory sizes passed in from the boot # block. Use them *only* if the boot block is unable to determine the correct @@ -57,7 +58,6 @@ options TCP_COMPAT_42 # TCP bug compatibility with 4.2BSD #options EXEC_ELF32 # 32-bit ELF executables (SVR4, Linux) -#options USER_LDT # user-settable LDT; used by WINE #options LKM # loadable kernel modules file-system FFS # UFS