svn commit: r240572 - head/sys/arm/conf
John-Mark Gurney
jmg at FreeBSD.org
Sun Sep 16 19:48:49 UTC 2012
Author: jmg
Date: Sun Sep 16 19:48:48 2012
New Revision: 240572
URL: http://svn.freebsd.org/changeset/base/240572
Log:
fix the kernel files to match our standard "option<space><tab>" format
such that when commenting/uncommentting lines, horizontal spacing is
maintained...
Also fix some minor comment formatting to line things up, etc...
Reviewed by: gnn, imp
MFC after: 1 week
Modified:
head/sys/arm/conf/ARMADAXP
head/sys/arm/conf/BEAGLEBONE
head/sys/arm/conf/CNS11XXNAS
head/sys/arm/conf/DOCKSTAR
head/sys/arm/conf/EA3250
head/sys/arm/conf/GUMSTIX-QEMU
head/sys/arm/conf/HL201
head/sys/arm/conf/KB920X
head/sys/arm/conf/LN2410SBC
head/sys/arm/conf/PANDABOARD
head/sys/arm/conf/QILA9G20
head/sys/arm/conf/RPI-B
head/sys/arm/conf/SAM9G20EK
head/sys/arm/conf/SAM9X25EK
head/sys/arm/conf/SHEEVAPLUG
head/sys/arm/conf/SN9G45
head/sys/arm/conf/TS7800
Modified: head/sys/arm/conf/ARMADAXP
==============================================================================
--- head/sys/arm/conf/ARMADAXP Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/ARMADAXP Sun Sep 16 19:48:48 2012 (r240572)
@@ -92,8 +92,8 @@ device mge # Marvell Gigabit Ethernet
device mii
device e1000phy
device bpf
-options HZ=1000
-options DEVICE_POLLING
+options HZ=1000
+options DEVICE_POLLING
device vlan
#PCI/PCIE
Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/BEAGLEBONE Sun Sep 16 19:48:48 2012 (r240572)
@@ -25,52 +25,52 @@ include "../ti/am335x/std.beaglebone"
makeoptions MODULES_OVERRIDE=""
makeoptions WITHOUT_MODULES="ahc"
-options HZ=100
-options SCHED_4BSD #4BSD scheduler
-options INET #InterNETworking
-options INET6 #IPv6 communications protocols
-options FFS #Berkeley Fast Filesystem
-options SOFTUPDATES #Enable FFS soft updates support
-options UFS_ACL #Support for access control lists
-options UFS_DIRHASH #Improve performance on big directories
-options MSDOSFS #MSDOS Filesystem
-options CD9660 #ISO 9660 Filesystem
-options PROCFS #Process filesystem (requires PSEUDOFS)
-options PSEUDOFS #Pseudo-filesystem framework
-options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
-options KTRACE #ktrace(1) support
-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 PREEMPTION
+options HZ=100
+options SCHED_4BSD #4BSD scheduler
+options INET #InterNETworking
+options INET6 #IPv6 communications protocols
+options FFS #Berkeley Fast Filesystem
+options SOFTUPDATES #Enable FFS soft updates support
+options UFS_ACL #Support for access control lists
+options UFS_DIRHASH #Improve performance on big directories
+options MSDOSFS #MSDOS Filesystem
+options CD9660 #ISO 9660 Filesystem
+options PROCFS #Process filesystem (requires PSEUDOFS)
+options PSEUDOFS #Pseudo-filesystem framework
+options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
+options KTRACE #ktrace(1) support
+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 PREEMPTION
# Debugging
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
-options BREAK_TO_DEBUGGER
-#options VERBOSE_SYSINIT #Enable verbose sysinit messages
-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 BREAK_TO_DEBUGGER
+#options VERBOSE_SYSINIT #Enable verbose sysinit messages
+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
# NFS support
-#options NFSCL
-#options NFSSERVER #Network Filesystem Server
-#options NFSCLIENT #Network Filesystem Client
+#options NFSCL
+#options NFSSERVER #Network Filesystem Server
+#options NFSCLIENT #Network Filesystem Client
# Uncomment this for NFS root
-#options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-#options BOOTP_NFSROOT
-#options BOOTP_COMPAT
-#options BOOTP
-#options BOOTP_NFSV3
-#options BOOTP_WIRED_TO=cpsw0
+#options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+#options BOOTP_NFSROOT
+#options BOOTP_COMPAT
+#options BOOTP
+#options BOOTP_NFSV3
+#options BOOTP_WIRED_TO=cpsw0
# MMC/SD/SDIO card slot support
@@ -78,7 +78,7 @@ device mmc # mmc/sd bus
device mmcsd # mmc/sd flash cards
# Boot device is 2nd slice on MMC/SD card
-options ROOTDEVNAME=\"ufs:mmcsd0s2\"
+options ROOTDEVNAME=\"ufs:mmcsd0s2\"
# Console and misc
device uart
@@ -99,9 +99,9 @@ device gpio
# USB support
device usb
-options USB_DEBUG
-#options USB_REQ_DEBUG
-#options USB_VERBOSE
+options USB_DEBUG
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
device musb
device umass
device scbus # SCSI bus (required for SCSI)
Modified: head/sys/arm/conf/CNS11XXNAS
==============================================================================
--- head/sys/arm/conf/CNS11XXNAS Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/CNS11XXNAS Sun Sep 16 19:48:48 2012 (r240572)
@@ -47,9 +47,9 @@ options DDB #Enable the kernel debugg
#options DIAGNOSTIC
-#options COMPAT_FREEBSD5
-#options COMPAT_FREEBSD6
-#options COMPAT_FREEBSD7
+#options COMPAT_FREEBSD5
+#options COMPAT_FREEBSD6
+#options COMPAT_FREEBSD7
options SCHED_ULE #ULE scheduler
@@ -121,4 +121,4 @@ device geom_label
device geom_journal
device geom_part_bsd
-options ROOTDEVNAME=\"ufs:da0s1a\"
+options ROOTDEVNAME=\"ufs:da0s1a\"
Modified: head/sys/arm/conf/DOCKSTAR
==============================================================================
--- head/sys/arm/conf/DOCKSTAR Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/DOCKSTAR Sun Sep 16 19:48:48 2012 (r240572)
@@ -56,8 +56,8 @@ device ether
device mge # Marvell Gigabit Ethernet controller
device mii
device bpf
-options HZ=1000
-options DEVICE_POLLING
+options HZ=1000
+options DEVICE_POLLING
device vlan
# USB
@@ -71,5 +71,5 @@ device da
# Flattened Device Tree
options FDT
-options FDT_DTB_STATIC
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=dockstar.dts
Modified: head/sys/arm/conf/EA3250
==============================================================================
--- head/sys/arm/conf/EA3250 Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/EA3250 Sun Sep 16 19:48:48 2012 (r240572)
@@ -65,7 +65,7 @@ device bpf
device lpe
# USB
-options USB_DEBUG
+options USB_DEBUG
device usb
device ohci
device umass
Modified: head/sys/arm/conf/GUMSTIX-QEMU
==============================================================================
--- head/sys/arm/conf/GUMSTIX-QEMU Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/GUMSTIX-QEMU Sun Sep 16 19:48:48 2012 (r240572)
@@ -21,5 +21,5 @@ include GUMSTIX
ident GUMSTIX-QEMU
-options QEMU_WORKAROUNDS
+options QEMU_WORKAROUNDS
nooptions ARM_CACHE_LOCK_ENABLE # QEMU does not implement this
Modified: head/sys/arm/conf/HL201
==============================================================================
--- head/sys/arm/conf/HL201 Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/HL201 Sun Sep 16 19:48:48 2012 (r240572)
@@ -49,7 +49,7 @@ options BOOTP_NFSV3
#options BOOTP_WIRED_TO=ate0
options BOOTP_COMPAT
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
@@ -128,5 +128,5 @@ device pass # Passthrough device (dire
#device wlan_ccmp # 802.11 CCMP support
#device wlan_tkip # 802.11 TKIP support
#device wlan_amrr # AMRR transmit rate control algorithm
-options ROOTDEVNAME=\"ufs:da0s1a\"
+options ROOTDEVNAME=\"ufs:da0s1a\"
Modified: head/sys/arm/conf/KB920X
==============================================================================
--- head/sys/arm/conf/KB920X Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/KB920X Sun Sep 16 19:48:48 2012 (r240572)
@@ -144,6 +144,6 @@ device usfs # emulate a flash
device cdce # emulate an ethernet
device usb_template # Control of the gadget
-options IEEE80211_SUPPORT_MESH
+options IEEE80211_SUPPORT_MESH
-options AH_SUPPORT_AR5416
+options AH_SUPPORT_AR5416
Modified: head/sys/arm/conf/LN2410SBC
==============================================================================
--- head/sys/arm/conf/LN2410SBC Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/LN2410SBC Sun Sep 16 19:48:48 2012 (r240572)
@@ -40,7 +40,7 @@ options FFS #Berkeley Fast Filesystem
#options UFS_DIRHASH #Improve performance on big directories
#options MD_ROOT #MD is a potential root device
#options MD_ROOT_SIZE=4096 # 4MB ram disk
-options ROOTDEVNAME=\"ufs:da0s1\"
+options ROOTDEVNAME=\"ufs:da0s1\"
#options BOOTP
#options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/PANDABOARD Sun Sep 16 19:48:48 2012 (r240572)
@@ -46,15 +46,15 @@ options UFS_ACL #Support for access c
options UFS_DIRHASH #Improve performance on big directories
options NFSCLIENT #Network Filesystem Client
device snp
-#options NFSCL
+#options NFSCL
#options NFSSERVER #Network Filesystem Server
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-options BREAK_TO_DEBUGGER
-options BOOTP_NFSROOT
-options BOOTP_COMPAT
-options BOOTP
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=ue0
+options BREAK_TO_DEBUGGER
+options BOOTP_NFSROOT
+options BOOTP_COMPAT
+options BOOTP
+options BOOTP_NFSV3
+options BOOTP_WIRED_TO=ue0
options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
#options PROCFS #Process filesystem (requires PSEUDOFS)
@@ -93,7 +93,7 @@ device pty
device pl310 # PL310 L2 cache controller
# Debugging for use in -current
-#options VERBOSE_SYSINIT #Enable verbose sysinit messages
+#options VERBOSE_SYSINIT #Enable verbose sysinit messages
options KDB
options DDB #Enable the kernel debugger
#options INVARIANTS #Enable calls of extra sanity checking
@@ -106,16 +106,16 @@ device md
# The following enables MFS as root, this seems similar to an initramfs or initrd
# as used in Linux.
-# options MD_ROOT
-# options MD_ROOT_SIZE=7560
+#options MD_ROOT
+#options MD_ROOT_SIZE=7560
device random # Entropy device
# USB support
device usb
options USB_DEBUG
-#options USB_REQ_DEBUG
-#options USB_VERBOSE
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
device ohci
device ehci
device umass
@@ -125,7 +125,7 @@ device da # Direct Access (disks)
# USB Ethernet support, requires miibus
device miibus
-# device axe # ASIX Electronics USB Ethernet
+#device axe # ASIX Electronics USB Ethernet
device smsc # SMSC LAN95xx USB Ethernet
@@ -140,5 +140,5 @@ options FDT
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=pandaboard.dts
-# device vfp # vfp/neon
-# options ARM_VFP_SUPPORT # vfp/neon
+#device vfp # vfp/neon
+#options ARM_VFP_SUPPORT # vfp/neon
Modified: head/sys/arm/conf/QILA9G20
==============================================================================
--- head/sys/arm/conf/QILA9G20 Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/QILA9G20 Sun Sep 16 19:48:48 2012 (r240572)
@@ -51,7 +51,7 @@ options NFSCL #New Network Filesystem
options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Modified: head/sys/arm/conf/RPI-B
==============================================================================
--- head/sys/arm/conf/RPI-B Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/RPI-B Sun Sep 16 19:48:48 2012 (r240572)
@@ -24,12 +24,12 @@ cpu CPU_ARM11
files "../broadcom/bcm2835/files.bcm2835"
makeoptions MODULES_OVERRIDE=""
-options KERNVIRTADDR=0xc0100000
+options KERNVIRTADDR=0xc0100000
makeoptions KERNVIRTADDR=0xc0100000
-options KERNPHYSADDR=0x00100000
+options KERNPHYSADDR=0x00100000
makeoptions KERNPHYSADDR=0x00100000
-options PHYSADDR=0x00000000
-options STARTUP_PAGETABLE_ADDR=0x01000000
+options PHYSADDR=0x00000000
+options STARTUP_PAGETABLE_ADDR=0x01000000
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
options HZ=100
@@ -42,13 +42,13 @@ options UFS_ACL #Support for access c
options UFS_DIRHASH #Improve performance on big directories
device snp
-# options NFSCL #Network Filesystem Client
-# options NFS_ROOT #NFS usable as /, requires NFSCLIENT
-# options BOOTP_NFSROOT
-# options BOOTP_COMPAT
-# options BOOTP
-# options BOOTP_NFSV3
-# options BOOTP_WIRED_TO=ue0
+#options NFSCL #Network Filesystem Client
+#options NFS_ROOT #NFS usable as /, requires NFSCLIENT
+#options BOOTP_NFSROOT
+#options BOOTP_COMPAT
+#options BOOTP
+#options BOOTP_NFSV3
+#options BOOTP_WIRED_TO=ue0
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
Modified: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/SAM9G20EK Sun Sep 16 19:48:48 2012 (r240572)
@@ -50,7 +50,7 @@ options NFSCL #New Network Filesystem
options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Modified: head/sys/arm/conf/SAM9X25EK
==============================================================================
--- head/sys/arm/conf/SAM9X25EK Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/SAM9X25EK Sun Sep 16 19:48:48 2012 (r240572)
@@ -51,7 +51,7 @@ options NFSCL #New Network Filesystem
options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Modified: head/sys/arm/conf/SHEEVAPLUG
==============================================================================
--- head/sys/arm/conf/SHEEVAPLUG Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/SHEEVAPLUG Sun Sep 16 19:48:48 2012 (r240572)
@@ -56,8 +56,8 @@ device mge # Marvell Gigabit Ethernet
device mii
device e1000phy
device bpf
-options HZ=1000
-options DEVICE_POLLING
+options HZ=1000
+options DEVICE_POLLING
device vlan
device cesa # Marvell security engine
@@ -78,5 +78,5 @@ device nand
# Flattened Device Tree
options FDT
-options FDT_DTB_STATIC
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=sheevaplug.dts
Modified: head/sys/arm/conf/SN9G45
==============================================================================
--- head/sys/arm/conf/SN9G45 Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/SN9G45 Sun Sep 16 19:48:48 2012 (r240572)
@@ -50,7 +50,7 @@ options NFSCL #New Network Filesystem
options ROOTDEVNAME=\"ufs:/dev/da0s1\"
-options ALT_BREAK_TO_DEBUGGER
+options ALT_BREAK_TO_DEBUGGER
#options MSDOSFS #MSDOS Filesystem
#options CD9660 #ISO 9660 Filesystem
Modified: head/sys/arm/conf/TS7800
==============================================================================
--- head/sys/arm/conf/TS7800 Sun Sep 16 19:42:27 2012 (r240571)
+++ head/sys/arm/conf/TS7800 Sun Sep 16 19:48:48 2012 (r240572)
@@ -74,6 +74,6 @@ options ATA_CAM
# Flattened Device Tree
options FDT
-options FDT_DTB_STATIC
+options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=ts7800.dts
More information about the svn-src-all
mailing list