Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/conf Reduce diffs against GENERIC.
details: https://anonhg.NetBSD.org/src/rev/28a18ef15a38
branches: trunk
changeset: 749206:28a18ef15a38
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Sat Nov 21 13:19:04 2009 +0000
description:
Reduce diffs against GENERIC.
diffstat:
sys/arch/i386/conf/ALL | 179 ++++++++++++++++++++++++++++++------------------
1 files changed, 112 insertions(+), 67 deletions(-)
diffs (truncated from 557 to 300 lines):
diff -r 636920a2156b -r 28a18ef15a38 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Sat Nov 21 12:28:51 2009 +0000
+++ b/sys/arch/i386/conf/ALL Sat Nov 21 13:19:04 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.219 2009/11/12 14:58:09 tron Exp $
+# $NetBSD: ALL,v 1.220 2009/11/21 13:19:04 tsutsui Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,15 +17,16 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.219 $"
+#ident "ALL-$Revision: 1.220 $"
-maxusers 32 # estimated number of users
+maxusers 64 # estimated number of users
makeoptions USE_SSP=yes
# CPU-related options.
options VM86 # virtual 8086 emulation
options USER_LDT # user-settable LDT; used by WINE
+options X86EMU # 386 Real Mode emulator
# Enhanced SpeedStep Technology in the Pentium M
options ENHANCED_SPEEDSTEP
@@ -70,6 +71,13 @@
options REALBASEMEM=639 # size of base memory (in KB)
options REALEXTMEM=15360 # size of extended memory (in KB)
+# The following options limit the overall size of physical memory
+# and/or the maximum address used by the system.
+# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
+# and can deal with holes in the memory layout.
+options PHYSMEM_MAX_SIZE=64 # max size of physical memory (in MB)
+options PHYSMEM_MAX_ADDR=2048 # don't use memory above this (in MB)
+
# Standard system options
options INSECURE # disable kernel security levels - X needs this
@@ -79,6 +87,7 @@
options KTRACE # system call tracing via ktrace(1)
+# Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SEMMNI=10 # number of semaphore identifiers
@@ -88,7 +97,7 @@
options SYSVSHM # System V-like memory sharing
options P1003_1B_SEMAPHORE # p1003.1b semaphore support
-options MODULAR # new modules framework
+options MODULAR # new style module framework
options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
@@ -101,14 +110,15 @@
options BEEP_ONHALT_PITCH=1500 # Default frequency (in Hz)
options BEEP_ONHALT_PERIOD=250 # Default duration (in msecs)
-# Enable experimental buffer queue strategy for better responsiveness under
-# high disk I/O load. Likely stable but not yet the default.
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
options BUFQ_READPRIO
options BUFQ_PRIOCSCAN
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
options DEBUG # expensive debugging checks/support
+options LOCKDEBUG # expensive locking checks/support
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
@@ -136,6 +146,7 @@
options COMPAT_20 # NetBSD 2.0
options COMPAT_30 # NetBSD 3.0
options COMPAT_40 # NetBSD 4.0
+options COMPAT_50 # NetBSD 5.0
options COMPAT_43 # 4.3BSD, 386BSD, and BSDI
options COMPAT_386BSD_MBRPART # recognize old partition ID
options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
@@ -152,7 +163,12 @@
options COMPAT_PECOFF # kernel support to run Win32 apps
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
-options X86EMU # 386 Real Mode emulator
+# Wedge support
+options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
+options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
+# The following two options can break /etc/fstab, so handle with care
+options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges
+options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges
# File systems
file-system FFS # UFS
@@ -188,10 +204,8 @@
options QUOTA # UFS quotas
options FFS_EI # FFS Endian Independent support
options WAPBL # File system journaling support - Experimental
-# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
-# It is not recommended for general use.
options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
-options UFS_EXTATTR
+options UFS_EXTATTR
options NFSSERVER # Network File System server
options FFS_NO_SNAPSHOT # No FFS snapshot support
options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
@@ -217,7 +231,7 @@
options IPFILTER_LOG # ipmon(8) log support
options IPFILTER_LOOKUP # ippool(8) support
options IPFILTER_DEFAULT_BLOCK # block all packets by default
-#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
+options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
options TCP_SIGNATURE # RFC2385 support, used with BGP
options ALTQ # Manipulate network interfaces' output queues
@@ -246,7 +260,7 @@
options PNPBIOSVERBOSE # verbose PnP BIOS messages
#options PNPBIOSDEBUG # more fulsome PnP BIOS debugging messages
options MCAVERBOSE # verbose MCA device autoconfig messages
-options I2C_SCAN # Scan i2c bus for responses
+options I2C_SCAN # Scan i2c bus for responses
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
@@ -300,8 +314,8 @@
#options SPLASHSCREEN_PROGRESS
# Keylock support
-options KEYLOCK
-options secmodel_keylock
+options KEYLOCK
+options secmodel_keylock # Requires options KEYLOCK
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -334,8 +348,8 @@
# This option can be used to retrieve CPU and APIC information.
# that I/O APICs can be used if ACPI is enabled below.
-#options MPBIOS_SCANPCI # find PCI roots using MPBIOS
-#options ACPI_SCANPCI # find PCI roots using ACPI
+options MPBIOS_SCANPCI # find PCI roots using MPBIOS
+options ACPI_SCANPCI # find PCI roots using ACPI
acpi0 at mainbus0
@@ -343,9 +357,11 @@
options ACPICA_PEDANTIC # force strict conformance to the Spec.
# ACPI devices
+apm* at acpi? # ACPI apm emulation
acpiacad* at acpi? # ACPI AC Adapter
acpibat* at acpi? # ACPI Battery
acpibut* at acpi? # ACPI Button
+acpidalb* at acpi? # ACPI Direct Application Launch Button
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
@@ -356,7 +372,7 @@
acpiwmi* at acpi? # ACPI WMI Mapper
# Mainboard devices
-aiboost* at acpi? # ASUS AI Booster Hardware monitor
+aiboost* at acpi? # ASUS AI Booster Hardware Monitor
asus* at acpi? # ASUS hotkeys
attimer* at acpi? # AT Timer
com* at acpi? # Serial communications interface
@@ -419,6 +435,7 @@
pci* at mainbus? bus ?
pci* at pchb? bus ?
pci* at ppb? bus ?
+pci* at elansc? bus ?
# Configure PCI using BIOS information
options PCIBIOS # PCI BIOS support
@@ -444,14 +461,17 @@
elanpar* at elansc?
elanpex* at elansc?
+# Temperatures
+amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors
+
# PCI bridges
amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET
hpet* at amdpcib?
-ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ watchdog and
- # SpeedStep support
+ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter,
+ # watchdog, SpeedStep and HPET
hpet0 at ichlpcib? # High Precision Event Timer
gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/
-gpio* at gcscpcib? # timecounter, watchdog and GPIO
+gpio* at gcscpcib? # timecounter, watchdog and GPIO
piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep
gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support
viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support
@@ -530,12 +550,12 @@
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
+genfb* at pci? dev ? function ? # generic linear framebuffer driver
machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver
-genfb* at pci? dev ? function ? # generic linear framebuffer driver
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
+wsdisplay* at wsemuldisplaydev?
wsdisplay* at machfb? console ?
-wsdisplay* at wsemuldisplaydev?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
@@ -550,11 +570,11 @@
# DRI driver
i915drm* at vga? # Intel i915, i945 DRM driver
mach64drm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
-mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
+mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
r128drm* at vga? # ATI Rage 128 DRM driver
radeondrm* at vga? # ATI Radeon DRM driver
savagedrm* at vga? # S3 Savage DRM driver
-sisdrm* at vga? # SiS DRM driver
+sisdrm* at vga? # SiS DRM driver
tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
viadrm* at vga? # VIA UniChrome DRM driver
@@ -631,8 +651,6 @@
# Hardware monitors
-amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors
-
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
iic* at amdpm? # sensors below are on this bus
@@ -656,7 +674,7 @@
piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller
iic* at piixpm? # SMBus on PIIX4
-# dbCool thermal monitor and fan controller
+# dbCool Thermal monitor and fan controller
dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
dbcool* at iic? addr 0x2D # Tyan S2881
dbcool* at iic? addr 0x2E # Tyan S2882-D
@@ -694,6 +712,9 @@
# Serial Presence Detect capable memory modules and optional temp sensors
spdmem* at iic? addr 0x50
+spdmem* at iic? addr 0x51
+spdmem* at iic? addr 0x52
+spdmem* at iic? addr 0x53
sdtemp* at iic? addr 0x18
# I2O devices
@@ -708,11 +729,15 @@
# 1-Wire support
gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio
+gpioow* at gpio?
onewire* at gpioow?
# 1-Wire devices
owtemp* at onewire? # Temperature sensors
+# Keylock support
+gpiolock* at gpio?
+
# SCSI Controllers and Devices
# PCI SCSI controllers
@@ -848,6 +873,7 @@
slide* at pci? dev ? function ? # Symphony Labs IDE controllers
svwsata* at pci? dev ? function ? # ServerWorks SATA controllers
stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers
+toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
# ISA Plug-and-Play IDE controllers
@@ -869,7 +895,7 @@
# ATA (IDE) bus support
atabus* at ata?
-options ATADEBUG
+options ATADEBUG
# IDE drives
# Flags are used only with controllers that support DMA operations
@@ -925,7 +951,7 @@
# Network Interfaces
# PCI network interfaces
-age* at pci? dev ? function ? # Attansic/Atheros L1 gigabit Ethernet
+age* at pci? dev ? function ? # Attansic/Atheros L1 Gigabit Ethernet
an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet
ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11
Home |
Main Index |
Thread Index |
Old Index