summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/conf/DISKLESS7
-rw-r--r--sys/arch/i386/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/NETTAN8
-rw-r--r--sys/arch/i386/conf/PETRA8
-rw-r--r--sys/arch/i386/conf/RAMDISK7
-rw-r--r--sys/arch/i386/conf/RAMDISKB7
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD7
7 files changed, 9 insertions, 41 deletions
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index ebe1ccec52b..97cc4ea1240 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $OpenBSD: DISKLESS,v 1.26 1999/10/29 05:10:53 angelos Exp $
+# $OpenBSD: DISKLESS,v 1.27 2000/03/02 18:38:27 mickey Exp $
# $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
@@ -13,11 +13,6 @@ option I486_CPU
option I586_CPU
option GPL_MATH_EMULATE # floating point emulation
-# Some BIOSes don't get the size of extended memory right. If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option EXTMEM_SIZE=... # size of extended memory
-
#option DUMMY_NOPS # speed hack; recommended
option XSERVER # diddle with console driver
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index f12f3a5c70f..37606a82070 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.158 2000/02/11 18:47:17 jason Exp $
+# $OpenBSD: GENERIC,v 1.159 2000/03/02 18:38:27 mickey Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -21,10 +21,6 @@ option UVM # use the UVM virtual memory system
option XSERVER # diddle with console driver
option APERTURE # in-kernel aperture driver for XFree86
-# Some BIOSes don't get the size of extended memory right. If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option EXTMEM_SIZE=... # size of extended memory
#option DUMMY_NOPS # speed hack; recommended
option COMPAT_SVR4 # binary compatibility with SVR4
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 6f401e8a56f..d2d558c0115 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-# $OpenBSD: NETTAN,v 1.37 2000/01/09 01:42:25 jason Exp $
+# $OpenBSD: NETTAN,v 1.38 2000/03/02 18:38:27 mickey Exp $
#
# NETTAN -- Applitron Datasystem AB
#
@@ -6,7 +6,7 @@
machine i386 # architecture, used by config; REQUIRED
#include "../../../conf/GENERIC"
-# $OpenBSD: NETTAN,v 1.37 2000/01/09 01:42:25 jason Exp $
+# $OpenBSD: NETTAN,v 1.38 2000/03/02 18:38:27 mickey Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -111,10 +111,6 @@ option USER_LDT # user-settable LDT; used by WINE
option XSERVER # diddle with console driver
option APERTURE # in-kernel aperture driver for XFree86
-# Some BIOSes don't get the size of extended memory right. If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option EXTMEM_SIZE=... # size of extended memory
#option DUMMY_NOPS # speed hack; recommended
option COMPAT_SVR4 # binary compatibility with SVR4
diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index 2c56734c3eb..9aaf37b4053 100644
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-# $OpenBSD: PETRA,v 1.19 2000/01/09 01:42:26 jason Exp $
+# $OpenBSD: PETRA,v 1.20 2000/03/02 18:38:27 mickey Exp $
#
# PETRA -- everything that's currently supported with certain
# changes for Applitron's fileserver petra, a 128 MB
@@ -10,7 +10,7 @@ machine i386 # architecture, used by config; REQUIRED
makeoptions DEBUG="-g" # make a bsd.gdb too
#include "../../../conf/GENERIC"
-# $OpenBSD: PETRA,v 1.19 2000/01/09 01:42:26 jason Exp $
+# $OpenBSD: PETRA,v 1.20 2000/03/02 18:38:27 mickey Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -109,10 +109,6 @@ option USER_LDT # user-settable LDT; used by WINE
option XSERVER # diddle with console driver
option APERTURE # in-kernel aperture driver for XFree86
-# Some BIOSes don't get the size of extended memory right. If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option EXTMEM_SIZE=130000 # size of extended memory
option BUFCACHEPERCENT=50 # how much for the buffer cache?
#option DUMMY_NOPS # speed hack; recommended
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index e9d145402de..3318b1cea89 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.77 2000/01/13 16:33:43 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.78 2000/03/02 18:38:27 mickey Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -17,11 +17,6 @@ option GPL_MATH_EMULATE # floating point emulation
option UVM # use the UVM virtual memory system
-# Some BIOSes don't get the size of extended memory right. If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option EXTMEM_SIZE=... # size of extended memory
-
#option DUMMY_NOPS # speed hack; recommended
maxusers 4 # estimated number of users
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 51809a6dc55..1d4e8815eef 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.12 2000/01/09 01:42:26 jason Exp $
+# $OpenBSD: RAMDISKB,v 1.13 2000/03/02 18:38:27 mickey Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -17,11 +17,6 @@ option GPL_MATH_EMULATE # floating point emulation
option UVM # use the UVM virtual memory system
-# Some BIOSes don't get the size of extended memory right. If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option EXTMEM_SIZE=... # size of extended memory
-
#option DUMMY_NOPS # speed hack; recommended
maxusers 4 # estimated number of users
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 9a330cf0a84..c78f7c0d741 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.11 2000/01/09 01:42:26 jason Exp $
+# $OpenBSD: RAMDISK_CD,v 1.12 2000/03/02 18:38:27 mickey Exp $
# from: OpenBSD: INST,v 1.19 1996/11/05 03:49:13 tholo Exp
#
# Install kernels no longer support X.
@@ -17,11 +17,6 @@ option GPL_MATH_EMULATE # floating point emulation
option UVM # use the UVM virtual memory system
-# Some BIOSes don't get the size of extended memory right. If you
-# have a broken BIOS, uncomment the following and set the value
-# properly for your system.
-#option EXTMEM_SIZE=... # size of extended memory
-
#option DUMMY_NOPS # speed hack; recommended
maxusers 4 # estimated number of users