summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2005-10-28 15:30:51 +0000
committernyan <nyan@FreeBSD.org>2005-10-28 15:30:51 +0000
commitc889c4ea8c5e98777a6ceb36702f701eb266d0b6 (patch)
tree170c343a0e1cb899c25796957641d8d538574f6a
parentbdd1a33a3065615d45fbda8f2131d9823c371946 (diff)
downloadFreeBSD-src-c889c4ea8c5e98777a6ceb36702f701eb266d0b6.zip
FreeBSD-src-c889c4ea8c5e98777a6ceb36702f701eb266d0b6.tar.gz
Move the isa, npx, mem and io devices and the PC98 option from GENERIC
into DEFAULTS.
-rw-r--r--sys/pc98/conf/DEFAULTS18
-rw-r--r--sys/pc98/conf/GENERIC8
2 files changed, 19 insertions, 7 deletions
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
new file mode 100644
index 0000000..bb0dab4
--- /dev/null
+++ b/sys/pc98/conf/DEFAULTS
@@ -0,0 +1,18 @@
+#
+# DEFAULTS -- Default kernel configuration file for FreeBSD/pc98
+#
+# $FreeBSD$
+
+# Not yet, this would break all existing configs
+#machine pc98 i386
+options PC98
+
+# Bus support.
+device isa
+
+# Floating point support.
+device npx
+
+# Pseudo devices.
+device mem # Memory and kernel memory devices
+device io # I/O device
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 950ed0c..ffdc052 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -29,7 +29,6 @@ ident GENERIC
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
-options PC98 # PC98
#options SCHED_ULE # ULE scheduler
options SCHED_4BSD # 4BSD scheduler
options PREEMPTION # Enable kernel thread preemption
@@ -75,7 +74,7 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
#options SMP # Symmetric MultiProcessor Kernel
#device apic # I/O APIC
-device isa
+# Bus support.
device pci
# Floppy drives
@@ -125,9 +124,6 @@ device sc
#device agp # support several AGP chipsets
-# Floating point support - do not disable.
-device npx
-
# Power management support (see NOTES for more options)
#device apm
#device pmc
@@ -217,8 +213,6 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
# Pseudo devices.
device loop # Network loopback
-device mem # Memory and kernel memory devices
-device io # I/O device
device random # Entropy device
device ether # Ethernet support
device sl # Kernel SLIP
OpenPOWER on IntegriCloud