svn commit: r191954 - in head/sys: amd64/conf arm/conf conf
i386/conf ia64/conf mips/conf pc98/conf powerpc/conf sparc64/conf
Jun Kuriyama
kuriyama at FreeBSD.org
Sun May 10 00:00:26 UTC 2009
Author: kuriyama
Date: Sun May 10 00:00:25 2009
New Revision: 191954
URL: http://svn.freebsd.org/changeset/base/191954
Log:
- Use "device\t" and "options \t" for consistency.
Modified:
head/sys/amd64/conf/DEFAULTS
head/sys/amd64/conf/GENERIC
head/sys/amd64/conf/NOTES
head/sys/amd64/conf/XENHVM
head/sys/arm/conf/AVILA
head/sys/arm/conf/BWCT
head/sys/arm/conf/CAMBRIA
head/sys/arm/conf/CRB
head/sys/arm/conf/DB-78XXX
head/sys/arm/conf/DB-88F5XXX
head/sys/arm/conf/DB-88F6XXX
head/sys/arm/conf/EP80219
head/sys/arm/conf/GUMSTIX
head/sys/arm/conf/HL200
head/sys/arm/conf/IQ31244
head/sys/arm/conf/KB920X
head/sys/arm/conf/NSLU
head/sys/arm/conf/SIMICS
head/sys/arm/conf/SKYEYE
head/sys/conf/NOTES
head/sys/i386/conf/DEFAULTS
head/sys/i386/conf/GENERIC
head/sys/i386/conf/NOTES
head/sys/i386/conf/PAE
head/sys/i386/conf/XBOX
head/sys/i386/conf/XEN
head/sys/ia64/conf/DEFAULTS
head/sys/ia64/conf/NOTES
head/sys/mips/conf/ADM5120
head/sys/mips/conf/IDT
head/sys/mips/conf/MALTA
head/sys/mips/conf/QEMU
head/sys/mips/conf/SENTRY5
head/sys/pc98/conf/DEFAULTS
head/sys/pc98/conf/NOTES
head/sys/powerpc/conf/GENERIC
head/sys/powerpc/conf/MPC85XX
head/sys/powerpc/conf/NOTES
head/sys/sparc64/conf/GENERIC
Modified: head/sys/amd64/conf/DEFAULTS
==============================================================================
--- head/sys/amd64/conf/DEFAULTS Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/amd64/conf/DEFAULTS Sun May 10 00:00:25 2009 (r191954)
@@ -21,4 +21,4 @@ options GEOM_PART_EBR
options GEOM_PART_EBR_COMPAT
options GEOM_PART_MBR
-options FLOWTABLE
+options FLOWTABLE
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/amd64/conf/GENERIC Sun May 10 00:00:25 2009 (r191954)
@@ -68,7 +68,7 @@ options SYSVSEM # SYSV-style semaphor
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options STOP_NMI # Stop CPUS using NMI instead of IPI
-options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
#options KDTRACE_FRAME # Ensure frames are compiled in
#options KDTRACE_HOOKS # Kernel DTrace hooks
@@ -114,7 +114,7 @@ options AHD_REG_PRETTY_PRINT # Print re
device amd # AMD 53C974 (Tekram DC-390(T))
device hptiop # Highpoint RocketRaid 3xxx series
device isp # Qlogic family
-#device ispfw # Firmware for QLogic HBAs- normally a module
+#device ispfw # Firmware for QLogic HBAs- normally a module
device mpt # LSI-Logic MPT-Fusion
#device ncr # NCR/Symbios Logic
device sym # NCR/Symbios Logic (newer chipsets + those of `ncr')
@@ -260,7 +260,7 @@ device wlan_amrr # AMRR transmit rate c
device an # Aironet 4500/4800 802.11 wireless NICs.
device ath # Atheros pci/cardbus NIC's
device ath_hal # pci/cardbus chip support
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
device ath_rate_sample # SampleRate tx rate control for ath
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/amd64/conf/NOTES Sun May 10 00:00:25 2009 (r191954)
@@ -33,7 +33,7 @@ options MP_WATCHDOG
#
# Debugging options.
#
-options STOP_NMI # Stop CPUS using NMI instead of IPI
+options STOP_NMI # Stop CPUS using NMI instead of IPI
@@ -82,7 +82,7 @@ options DEVICE_POLLING
# BPF_JITTER adds support for BPF just-in-time compiler.
-options BPF_JITTER
+options BPF_JITTER
#####################################################################
@@ -153,7 +153,7 @@ device agp
#
# AGP debugging.
#
-options AGP_DEBUG
+options AGP_DEBUG
#####################################################################
@@ -288,7 +288,7 @@ device wpi
device ath # Atheros pci/cardbus NIC's
device ath_hal # pci/cardbus chip support
-options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
+options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors
device ath_rate_sample # SampleRate tx rate control for ath
#device ath_rate_amrr # AMRR rate control for ath driver
#device ath_rate_onoe # Onoe rate control for ath driver
@@ -457,7 +457,7 @@ options LINPROCFS
#Enable the linux-like sys filesystem support (requires COMPAT_LINUX32
# and PSEUDOFS)
-options LINSYSFS
+options LINSYSFS
#
# SysVR4 ABI emulation
Modified: head/sys/amd64/conf/XENHVM
==============================================================================
--- head/sys/amd64/conf/XENHVM Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/amd64/conf/XENHVM Sun May 10 00:00:25 2009 (r191954)
@@ -69,12 +69,12 @@ options SYSVSEM # SYSV-style semaphor
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options STOP_NMI # Stop CPUS using NMI instead of IPI
-options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
+options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
#options KDTRACE_FRAME # Ensure frames are compiled in
#options KDTRACE_HOOKS # Kernel DTrace hooks
-options NO_ADAPTIVE_MUTEXES
-options NO_ADAPTIVE_RWLOCKS
+options NO_ADAPTIVE_MUTEXES
+options NO_ADAPTIVE_RWLOCKS
# Debugging for use in -current
options KDB # Enable kernel debugger support.
@@ -99,7 +99,7 @@ device pci
device fdc
# Xen HVM support
-options XENHVM
+options XENHVM
device xenpci
# ATA and ATAPI devices
Modified: head/sys/arm/conf/AVILA
==============================================================================
--- head/sys/arm/conf/AVILA Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/AVILA Sun May 10 00:00:25 2009 (r191954)
@@ -99,12 +99,12 @@ device loop
device if_bridge
device md
-device random # Entropy device
+device random # Entropy device
# Wireless NIC cards
device wlan # 802.11 support
-options IEEE80211_DEBUG
-options IEEE80211_SUPPORT_TDMA
+options IEEE80211_DEBUG
+options IEEE80211_SUPPORT_TDMA
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
@@ -112,12 +112,12 @@ device wlan_xauth
device ath # Atheros pci/cardbus NIC's
options ATH_DEBUG
-options ATH_DIAGAPI
-#options ATH_TX99_DIAG
+options ATH_DIAGAPI
+#options ATH_TX99_DIAG
device ath_rate_sample # SampleRate tx rate control for ath
-#options AH_DEBUG
-#options AH_ASSERT
+#options AH_DEBUG
+#options AH_ASSERT
#device ath_ar5210
#device ath_ar5211
device ath_ar5212
@@ -129,7 +129,7 @@ device ath_rf5112
device ath_rf5413
#
device ath_ar5416
-options AH_SUPPORT_AR5416
+options AH_SUPPORT_AR5416
device ath_ar9160
makeoptions WITH_LEGACY
Modified: head/sys/arm/conf/BWCT
==============================================================================
--- head/sys/arm/conf/BWCT Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/BWCT Sun May 10 00:00:25 2009 (r191954)
@@ -19,9 +19,9 @@
ident BWCT
-options VERBOSE_INIT_ARM
+options VERBOSE_INIT_ARM
-options AT91_BWCT
+options AT91_BWCT
include "../at91/std.bwct"
#To statically compile in device wiring instead of /boot/device.hints
@@ -30,8 +30,8 @@ hints "BWCT.hints"
makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-options DDB
-options KDB
+options DDB
+options KDB
options BREAK_TO_DEBUGGER
options ALT_BREAK_TO_DEBUGGER
@@ -43,15 +43,15 @@ options SOFTUPDATES #Enable FFS soft u
#options UFS_ACL #Support for access control lists
#options UFS_DIRHASH #Improve performance on big directories
#options MD_ROOT #MD is a potential root device
-#options MD_ROOT_SIZE=4096 # 3MB ram disk
+#options MD_ROOT_SIZE=4096 # 3MB ram disk
#options ROOTDEVNAME=\"ufs:md0\"
#options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
options NFSCLIENT #Network Filesystem Client
#options NFSSERVER #Network Filesystem Server
#options NFSLOCKD #Network Lock Manager
-options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-options BOOTP_NFSROOT
-options BOOTP
+options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+options BOOTP_NFSROOT
+options BOOTP
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
@@ -65,7 +65,7 @@ options SYSVSEM #SYSV-style semaphore
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
#options SYSCTL_OMIT_DESCR
options MUTEX_NOINLINE
-options RWLOCK_NOINLINE
+options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
device loop
@@ -83,7 +83,7 @@ device rlswitch
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options DIAGNOSTIC
+#options DIAGNOSTIC
device md
device at91_twi # TWI: Two Wire Interface
Modified: head/sys/arm/conf/CAMBRIA
==============================================================================
--- head/sys/arm/conf/CAMBRIA Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/CAMBRIA Sun May 10 00:00:25 2009 (r191954)
@@ -68,7 +68,7 @@ device uart
device ixpwdog # watchdog timer
-options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M
+options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M
device cfi # flash support
device cfid # flash disk support
device geom_redboot # redboot fis parser
@@ -86,7 +86,7 @@ device cambria_fled # Font Panel LED on
device cambria_led # 8-LED latch
device ata
-device atadisk # ATA disk drives
+device atadisk # ATA disk drives
device avila_ata # Gateworks CF/IDE support
device npe # Network Processing Engine
@@ -102,12 +102,12 @@ device loop
device if_bridge
device md
-device random # Entropy device
+device random # Entropy device
# Wireless NIC cards
device wlan # 802.11 support
-options IEEE80211_DEBUG
-options IEEE80211_SUPPORT_TDMA
+options IEEE80211_DEBUG
+options IEEE80211_SUPPORT_TDMA
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
@@ -115,13 +115,13 @@ device wlan_xauth
device ath # Atheros pci/cardbus NIC's
options ATH_DEBUG
-options ATH_DIAGAPI
-#options ATH_TX99_DIAG
+options ATH_DIAGAPI
+#options ATH_TX99_DIAG
device ath_rate_sample # SampleRate tx rate control for ath
-options AH_DEBUG
-#options AH_ASSERT
-options AH_PRIVATE_DIAG
+options AH_DEBUG
+#options AH_ASSERT
+options AH_PRIVATE_DIAG
#device ath_ar5210
#device ath_ar5211
#
@@ -133,7 +133,7 @@ device ath_rf5112
device ath_rf5413
#
#device ath_ar5416
-#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format
+#options AH_SUPPORT_AR5416 # NB: for 11n descriptor format
#device ath_rf2133
#device ath_ar9160
#device ath_ar9280
@@ -142,8 +142,8 @@ device ath_rf5413
# NB: 2 USB 2.0 ports standard
device usb
-options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
-#options USB_DEBUG
+options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order
+#options USB_DEBUG
device ehci
device umass
device scbus # SCSI bus (required for SCSI)
Modified: head/sys/arm/conf/CRB
==============================================================================
--- head/sys/arm/conf/CRB Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/CRB Sun May 10 00:00:25 2009 (r191954)
@@ -20,11 +20,11 @@
ident CRB
options PHYSADDR=0x00000000
-options KERNPHYSADDR=0x00200000
-options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
+options KERNPHYSADDR=0x00200000
+options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
-options COUNTS_PER_SEC=400000000
-options STARTUP_PAGETABLE_ADDR=0x00000000
+options COUNTS_PER_SEC=400000000
+options STARTUP_PAGETABLE_ADDR=0x00000000
include "../xscale/i8134x/std.crb"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
@@ -32,9 +32,9 @@ makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
-options HZ=100
-options BREAK_TO_DEBUGGER
-#options DEVICE_POLLING
+options HZ=100
+options BREAK_TO_DEBUGGER
+#options DEVICE_POLLING
options SCHED_4BSD #4BSD scheduler
options INET #InterNETworking
@@ -53,18 +53,18 @@ options CD9660 #ISO 9660 Filesystem
options PSEUDOFS #Pseudo-filesystem framework
options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) support
-options INTR_FILTER
+options INTR_FILTER
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=em0
-options BOOTP_COMPAT
-#options PREEMPTION
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=em0
+options BOOTP_COMPAT
+#options PREEMPTION
device loop
device ether
#device saarm
@@ -75,12 +75,12 @@ device uart
device pci
device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+device atadisk # ATA disk drives
+device ataraid # ATA RAID drives
+device atapicd # ATAPI CDROM drives
+device atapifd # ATAPI floppy drives
+device atapist # ATAPI tape drives
+options ATA_STATIC_ID # Static device numbering
device "7seg"
@@ -93,22 +93,22 @@ device pty
# output. Adds ~215k to driver.
# Debugging for use in -current
-options KDB
+options KDB
options DDB #Enable the kernel debugger
#options INVARIANTS #Enable calls of extra sanity checking
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options DIAGNOSTIC
+#options DIAGNOSTIC
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
#options APIC_IO # Symmetric (APIC) I/O
-options XSCALE_CACHE_READ_WRITE_ALLOCATE
-device md
-device random # Entropy device
+options XSCALE_CACHE_READ_WRITE_ALLOCATE
+device md
+device random # Entropy device
device iopwdog
-options ARM_USE_SMALL_ALLOC
+options ARM_USE_SMALL_ALLOC
# Floppy drives
Modified: head/sys/arm/conf/DB-78XXX
==============================================================================
--- head/sys/arm/conf/DB-78XXX Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/DB-78XXX Sun May 10 00:00:25 2009 (r191954)
@@ -7,7 +7,7 @@
ident DB-88F78XX
include "../mv/discovery/std.db78xxx"
-options SOC_MV_DISCOVERY
+options SOC_MV_DISCOVERY
makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
@@ -18,34 +18,34 @@ options INET #InterNETworking
options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem
options NFSCLIENT #Network Filesystem Client
-options NFSLOCKD #Network Lock Manager
+options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=mge0
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=mge0
-#options ROOTDEVNAME=\"ufs:/dev/da0a\"
+#options ROOTDEVNAME=\"ufs:/dev/da0a\"
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options MUTEX_NOINLINE
-options RWLOCK_NOINLINE
+options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
# Debugging
-options ALT_BREAK_TO_DEBUGGER
-options DDB
-options DIAGNOSTIC
+options ALT_BREAK_TO_DEBUGGER
+options DDB
+options DIAGNOSTIC
#options INVARIANTS #Enable calls of extra sanity checking
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-options KDB
+options KDB
options WITNESS #Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options WITNESS_KDB
+#options WITNESS_KDB
device pci
Modified: head/sys/arm/conf/DB-88F5XXX
==============================================================================
--- head/sys/arm/conf/DB-88F5XXX Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/DB-88F5XXX Sun May 10 00:00:25 2009 (r191954)
@@ -7,7 +7,7 @@
ident DB-88F5XXX
include "../mv/orion/std.db88f5xxx"
-options SOC_MV_ORION
+options SOC_MV_ORION
makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
@@ -18,34 +18,34 @@ options INET #InterNETworking
options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem
options NFSCLIENT #Network Filesystem Client
-options NFSLOCKD #Network Lock Manager
+options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=mge0
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=mge0
-#options ROOTDEVNAME=\"ufs:/dev/da0a\"
+#options ROOTDEVNAME=\"ufs:/dev/da0a\"
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options MUTEX_NOINLINE
-options RWLOCK_NOINLINE
+options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
# Debugging
-options ALT_BREAK_TO_DEBUGGER
-options DDB
-options DIAGNOSTIC
+options ALT_BREAK_TO_DEBUGGER
+options DDB
+options DIAGNOSTIC
#options INVARIANTS #Enable calls of extra sanity checking
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-options KDB
+options KDB
options WITNESS #Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options WITNESS_KDB
+#options WITNESS_KDB
device pci
@@ -64,8 +64,8 @@ device mge # Marvell Gigabit Ethernet
device mii
device e1000phy
device bpf
-options DEVICE_POLLING
-options HZ=1000
+options DEVICE_POLLING
+options HZ=1000
# I2C (TWSI)
device iic
Modified: head/sys/arm/conf/DB-88F6XXX
==============================================================================
--- head/sys/arm/conf/DB-88F6XXX Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/DB-88F6XXX Sun May 10 00:00:25 2009 (r191954)
@@ -7,7 +7,7 @@
ident DB-88F6XXX
include "../mv/kirkwood/std.db88f6xxx"
-options SOC_MV_KIRKWOOD
+options SOC_MV_KIRKWOOD
makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
@@ -18,34 +18,34 @@ options INET #InterNETworking
options INET6 #IPv6 communications protocols
options FFS #Berkeley Fast Filesystem
options NFSCLIENT #Network Filesystem Client
-options NFSLOCKD #Network Lock Manager
+options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=mge0
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=mge0
-#options ROOTDEVNAME=\"ufs:/dev/da0a\"
+#options ROOTDEVNAME=\"ufs:/dev/da0a\"
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options MUTEX_NOINLINE
-options RWLOCK_NOINLINE
+options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
# Debugging
-options ALT_BREAK_TO_DEBUGGER
-options DDB
-options DIAGNOSTIC
+options ALT_BREAK_TO_DEBUGGER
+options DDB
+options DIAGNOSTIC
#options INVARIANTS #Enable calls of extra sanity checking
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-options KDB
+options KDB
options WITNESS #Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options WITNESS_KDB
+#options WITNESS_KDB
device pci
Modified: head/sys/arm/conf/EP80219
==============================================================================
--- head/sys/arm/conf/EP80219 Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/EP80219 Sun May 10 00:00:25 2009 (r191954)
@@ -20,11 +20,11 @@
ident EP80219
options PHYSADDR=0xa0000000
-options KERNPHYSADDR=0xa0200000
-options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
+options KERNPHYSADDR=0xa0200000
+options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
options STARTUP_PAGETABLE_ADDR=0xa0000000
-#options ARM32_NEW_VM_LAYOUT
+#options ARM32_NEW_VM_LAYOUT
include "../xscale/i80321/std.ep80219"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
@@ -32,8 +32,8 @@ makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
-options HZ=100
-#options DEVICE_POLLING
+options HZ=100
+#options DEVICE_POLLING
options SCHED_4BSD #4BSD scheduler
options INET #InterNETworking
@@ -57,15 +57,15 @@ options SYSVMSG #SYSV-style message q
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options GEOM_PART_GPT # GUID Partition Tables.
-options GEOM_LABEL # Providers labelization.
+options GEOM_PART_GPT # GUID Partition Tables.
+options GEOM_LABEL # Providers labelization.
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=fxp0
-options BOOTP_COMPAT
-#options PREEMPTION
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=fxp0
+options BOOTP_COMPAT
+#options PREEMPTION
device loop
device ether
#device saarm
@@ -75,12 +75,12 @@ device uart
device pci
device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+device atadisk # ATA disk drives
+device ataraid # ATA RAID drives
+device atapicd # ATAPI CDROM drives
+device atapifd # ATAPI floppy drives
+device atapist # ATAPI tape drives
+options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
@@ -89,27 +89,27 @@ device iopwdog # I80321 Watchdog
device dma # I80321 DMA Controller
# Debugging for use in -current
-options KDB
+options KDB
options DDB #Enable the kernel debugger
#options INVARIANTS #Enable calls of extra sanity checking
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options DIAGNOSTIC
+#options DIAGNOSTIC
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
#options APIC_IO # Symmetric (APIC) I/O
-options XSCALE_CACHE_READ_WRITE_ALLOCATE
-device md
+options XSCALE_CACHE_READ_WRITE_ALLOCATE
+device md
device random # Entropy device
-options ARM_USE_SMALL_ALLOC
+options ARM_USE_SMALL_ALLOC
# Floppy drives
-options INCLUDE_CONFIG_FILE # Include this file in kernel
-#options VERBOSE_SYSINIT
-options VERBOSE_INIT_ARM
+options INCLUDE_CONFIG_FILE # Include this file in kernel
+#options VERBOSE_SYSINIT
+options VERBOSE_INIT_ARM
-device bpf
-#options ROOTDEVNAME=\"ufs:ad4s1a\"
+device bpf
+#options ROOTDEVNAME=\"ufs:ad4s1a\"
Modified: head/sys/arm/conf/GUMSTIX
==============================================================================
--- head/sys/arm/conf/GUMSTIX Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/GUMSTIX Sun May 10 00:00:25 2009 (r191954)
@@ -27,18 +27,18 @@ cpu CPU_XSCALE_PXA2X0
hints "GUMSTIX.hints"
options PHYSADDR=0xa0000000
-options KERNPHYSADDR=0xa0200000
-options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
+options KERNPHYSADDR=0xa0200000
+options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
-options STARTUP_PAGETABLE_ADDR=0xa0000000
+options STARTUP_PAGETABLE_ADDR=0xa0000000
include "../xscale/pxa/std.pxa"
#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" #Default places to look for devices.
makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-options HZ=100
-#options DEVICE_POLLING
+options HZ=100
+#options DEVICE_POLLING
options SCHED_4BSD #4BSD scheduler
options INET #InterNETworking
@@ -62,13 +62,13 @@ options SYSVMSG #SYSV-style message q
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_WIRED_TO=smc0
-options BOOTP_COMPAT
-options BOOTP_NFSV3
-options BOOTP_BLOCKSIZE=4096
-options PREEMPTION
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_WIRED_TO=smc0
+options BOOTP_COMPAT
+options BOOTP_NFSV3
+options BOOTP_BLOCKSIZE=4096
+options PREEMPTION
device loop
device ether
device mii
@@ -80,7 +80,7 @@ device uart_ns8250
device pty
# Debugging for use in -current
-options KDB
+options KDB
options DDB #Enable the kernel debugger
#options INVARIANTS #Enable calls of extra sanity checking
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
@@ -89,4 +89,4 @@ options DDB #Enable the kernel debugg
#options DIAGNOSTIC
device md
-device random # Entropy device
+device random # Entropy device
Modified: head/sys/arm/conf/HL200
==============================================================================
--- head/sys/arm/conf/HL200 Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/HL200 Sun May 10 00:00:25 2009 (r191954)
@@ -26,8 +26,8 @@ hints "KB920X.hints"
makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-options DDB
-options KDB
+options DDB
+options KDB
options SCHED_4BSD #4BSD scheduler
options INET #InterNETworking
@@ -44,7 +44,7 @@ options NFSCLIENT #Network Filesystem
#options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
options BOOTP_NFSROOT
-options BOOTP
+options BOOTP
options BOOTP_NFSV3
options BOOTP_WIRED_TO=ate0
options BOOTP_COMPAT
@@ -61,7 +61,7 @@ options SYSVSEM #SYSV-style semaphore
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
#options SYSCTL_OMIT_DESCR
options MUTEX_NOINLINE
-options RWLOCK_NOINLINE
+options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
device random
@@ -94,23 +94,23 @@ device icee
device bpf
# USB support
-device ohci # OHCI localbus->USB interface
-device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices
-device uhid # "Human Interface Devices"
-device ulpt # Printer
-device umass # Disks/Mass storage - Requires scbus and da
-device ural # Ralink Technology RT2500USB wireless NICs
-device rum # Ralink Technology RT2501USB wireless NICs
-device urio # Diamond Rio 500 MP3 player
+device ohci # OHCI localbus->USB interface
+device usb # USB Bus (required)
+#device udbp # USB Double Bulk Pipe devices
+device uhid # "Human Interface Devices"
+device ulpt # Printer
+device umass # Disks/Mass storage - Requires scbus and da
+device ural # Ralink Technology RT2500USB wireless NICs
+device rum # Ralink Technology RT2501USB wireless NICs
+device urio # Diamond Rio 500 MP3 player
# USB Ethernet, requires miibus
device miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cdce # Generic USB over Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
+device rue # RealTek RTL8150 USB Ethernet
device udav
# usb serial
device uark
@@ -122,13 +122,13 @@ device uplcom
device uvisor
device uvscom
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
-device da # Direct Access (disks)
-device cd # CD
-device pass # Passthrough device (direct SCSI access)
+device scbus # SCSI bus (required for SCSI)
+device da # Direct Access (disks)
+device cd # CD
+device pass # Passthrough device (direct SCSI access)
# Wireless NIC cards
-device wlan # 802.11 support
-device wlan_wep # 802.11 WEP support
-device wlan_ccmp # 802.11 CCMP support
-device wlan_tkip # 802.11 TKIP support
-device wlan_amrr # AMRR transmit rate control algorithm
+device wlan # 802.11 support
+device wlan_wep # 802.11 WEP support
+device wlan_ccmp # 802.11 CCMP support
+device wlan_tkip # 802.11 TKIP support
+device wlan_amrr # AMRR transmit rate control algorithm
Modified: head/sys/arm/conf/IQ31244
==============================================================================
--- head/sys/arm/conf/IQ31244 Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/IQ31244 Sun May 10 00:00:25 2009 (r191954)
@@ -20,10 +20,10 @@
ident IQ31244
options PHYSADDR=0xa0000000
-options KERNPHYSADDR=0xa0200000
-options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
-options FLASHADDR=0xf0000000
-options LOADERRAMADDR=0x00000000
+options KERNPHYSADDR=0xa0200000
+options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
+options FLASHADDR=0xf0000000
+options LOADERRAMADDR=0x00000000
options STARTUP_PAGETABLE_ADDR=0xa0000000
include "../xscale/i80321/std.iq31244"
@@ -33,8 +33,8 @@ makeoptions MODULES_OVERRIDE=""
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions CONF_CFLAGS=-mcpu=xscale
-options HZ=100
-#options DEVICE_POLLING
+options HZ=100
+#options DEVICE_POLLING
options SCHED_4BSD #4BSD scheduler
options INET #InterNETworking
@@ -58,12 +58,12 @@ options SYSVMSG #SYSV-style message q
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=em0
-options BOOTP_COMPAT
-#options PREEMPTION
+options BOOTP
+options BOOTP_NFSROOT
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=em0
+options BOOTP_COMPAT
+#options PREEMPTION
device loop
device ether
#device saarm
@@ -74,12 +74,12 @@ device uart
device pci
device ata
-device atadisk # ATA disk drives
-device ataraid # ATA RAID drives
-device atapicd # ATAPI CDROM drives
-device atapifd # ATAPI floppy drives
-device atapist # ATAPI tape drives
-options ATA_STATIC_ID # Static device numbering
+device atadisk # ATA disk drives
+device ataraid # ATA RAID drives
+device atapicd # ATAPI CDROM drives
+device atapifd # ATAPI floppy drives
+device atapist # ATAPI tape drives
+options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
@@ -94,21 +94,21 @@ device "iq31244_7seg" # IQ31244 7 seg
# output. Adds ~215k to driver.
# Debugging for use in -current
-options KDB
+options KDB
options DDB #Enable the kernel debugger
#options INVARIANTS #Enable calls of extra sanity checking
#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-#options DIAGNOSTIC
+#options DIAGNOSTIC
# To make an SMP kernel, the next two are needed
#options SMP # Symmetric MultiProcessor Kernel
#options APIC_IO # Symmetric (APIC) I/O
-options XSCALE_CACHE_READ_WRITE_ALLOCATE
-device md
-device random # Entropy device
+options XSCALE_CACHE_READ_WRITE_ALLOCATE
+device md
+device random # Entropy device
-options ARM_USE_SMALL_ALLOC
+options ARM_USE_SMALL_ALLOC
# Floppy drives
Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X Sat May 9 20:18:20 2009 (r191953)
+++ head/sys/arm/conf/KB920X Sun May 10 00:00:25 2009 (r191954)
@@ -95,40 +95,40 @@ device icee
device bpf
# USB support
-device ohci # OHCI localbus->USB interface
-device usb # USB Bus (required)
-#device udbp # USB Double Bulk Pipe devices
-device uhid # "Human Interface Devices"
-device ulpt # Printer
-device umass # Disks/Mass storage - Requires scbus and da
-device ural # Ralink Technology RT2500USB wireless NICs
-device rum # Ralink Technology RT2501USB wireless NICs
-device urio # Diamond Rio 500 MP3 player
+device ohci # OHCI localbus->USB interface
+device usb # USB Bus (required)
+#device udbp # USB Double Bulk Pipe devices
+device uhid # "Human Interface Devices"
+device ulpt # Printer
+device umass # Disks/Mass storage - Requires scbus and da
+device ural # Ralink Technology RT2500USB wireless NICs
+device rum # Ralink Technology RT2501USB wireless NICs
+device urio # Diamond Rio 500 MP3 player
# USB Ethernet, requires miibus
device miibus
-device aue # ADMtek USB Ethernet
-device axe # ASIX Electronics USB Ethernet
-device cdce # Generic USB over Ethernet
-device cue # CATC USB Ethernet
-device kue # Kawasaki LSI USB Ethernet
-device rue # RealTek RTL8150 USB Ethernet
+device aue # ADMtek USB Ethernet
+device axe # ASIX Electronics USB Ethernet
+device cdce # Generic USB over Ethernet
+device cue # CATC USB Ethernet
+device kue # Kawasaki LSI USB Ethernet
+device rue # RealTek RTL8150 USB Ethernet
device udav
# usb serial
-device uark
-device ubsa
-device uftdi
-device uipaq
-device uplcom
-device uvisor
-device uvscom
+device uark
+device ubsa
+device uftdi
+device uipaq
+device uplcom
+device uvisor
+device uvscom
# SCSI peripherals
-device scbus # SCSI bus (required for SCSI)
-device da # Direct Access (disks)
-device cd # CD
-device pass # Passthrough device (direct SCSI access)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list