diff options
| author | jhb <jhb@FreeBSD.org> | 2005-10-27 17:34:35 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2005-10-27 17:34:35 +0000 |
| commit | a6c1f476097b58c9780e3548ed2ec2db6d1b5f62 (patch) | |
| tree | fc1803826bab50ecc665e6f9ecf346114cc9184f /sys/i386/conf | |
| parent | 988b3c4ab8dff790f8050f2bb87b997609121ccf (diff) | |
| download | FreeBSD-src-a6c1f476097b58c9780e3548ed2ec2db6d1b5f62.zip FreeBSD-src-a6c1f476097b58c9780e3548ed2ec2db6d1b5f62.tar.gz | |
Create a default kernel config for i386 and move 'device isa' and
'device npx' (both of which aren't really optional right now) and
'device io' and 'device mem' (to preserve POLA for 4.x users upgrading
to 6.0) from GENERIC into DEFAULTS.
Requested by: scottl
Reviewed by: scottl
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/DEFAULTS | 17 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 8 |
2 files changed, 18 insertions, 7 deletions
diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS new file mode 100644 index 0000000..60cb04a --- /dev/null +++ b/sys/i386/conf/DEFAULTS @@ -0,0 +1,17 @@ +# +# DEFAULTS -- Default kernel configuration file for FreeBSD/i386 +# +# $FreeBSD$ + +# Not yet, this would break all existing configs +#machine i386 + +# 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/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 3cae1ff..08585e6 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -76,8 +76,7 @@ options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC -# Bus support. Do not remove isa, even if you have no isa slots -device isa +# Bus support. device eisa device pci @@ -163,9 +162,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 # Add suspend/resume support for the i8254. @@ -250,8 +246,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 |
