svn commit: r283368 - stable/10/sys/arm/conf
Ian Lepore
ian at FreeBSD.org
Sun May 24 14:25:08 UTC 2015
Author: ian
Date: Sun May 24 14:25:03 2015
New Revision: 283368
URL: https://svnweb.freebsd.org/changeset/base/283368
Log:
MFC r276004: Fix the indentation to simplify comparing the ARM config files.
Modified:
stable/10/sys/arm/conf/BEAGLEBONE
stable/10/sys/arm/conf/CNS11XXNAS
stable/10/sys/arm/conf/CUBIEBOARD
stable/10/sys/arm/conf/CUBIEBOARD2
stable/10/sys/arm/conf/DIGI-CCWMX53
stable/10/sys/arm/conf/DOCKSTAR
stable/10/sys/arm/conf/DREAMPLUG-1001
stable/10/sys/arm/conf/EFIKA_MX
stable/10/sys/arm/conf/EXYNOS5.common
stable/10/sys/arm/conf/HL201
stable/10/sys/arm/conf/IMX53
stable/10/sys/arm/conf/IMX53-QSB
stable/10/sys/arm/conf/IMX6
stable/10/sys/arm/conf/SAM9260EK
stable/10/sys/arm/conf/VERSATILEPB
stable/10/sys/arm/conf/VYBRID
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/arm/conf/BEAGLEBONE
==============================================================================
--- stable/10/sys/arm/conf/BEAGLEBONE Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/BEAGLEBONE Sun May 24 14:25:03 2015 (r283368)
@@ -77,7 +77,7 @@ options DDB # Enable the kernel debug
#options DIAGNOSTIC
# NFS server support
-#options NFSD
+#options NFSD
# NFS root from boopt/dhcp
#options BOOTP
Modified: stable/10/sys/arm/conf/CNS11XXNAS
==============================================================================
--- stable/10/sys/arm/conf/CNS11XXNAS Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/CNS11XXNAS Sun May 24 14:25:03 2015 (r283368)
@@ -103,7 +103,7 @@ device bpf
device loop
device md
-device random # Entropy device
+device random # Entropy device
device usb
@@ -114,12 +114,12 @@ device umass
device scbus # SCSI bus (required for ATA/SCSI)
device da # Direct Access (disks)
device pass
-device cfi
+device cfi
#device udav # Davicom DM9601E USB
device geom_label
device geom_journal
-device geom_part_bsd
+device geom_part_bsd
options ROOTDEVNAME=\"ufs:da0s1a\"
Modified: stable/10/sys/arm/conf/CUBIEBOARD
==============================================================================
--- stable/10/sys/arm/conf/CUBIEBOARD Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/CUBIEBOARD Sun May 24 14:25:03 2015 (r283368)
@@ -92,7 +92,7 @@ options ROOTDEVNAME=\"ufs:/dev/da0s2\"
# ATA controllers
#device ahci # AHCI-compatible SATA controllers
#device ata # Legacy ATA/SATA controllers
-#options ATA_STATIC_ID # Static device numbering
+#options ATA_STATIC_ID # Static device numbering
# Console and misc
device uart
Modified: stable/10/sys/arm/conf/CUBIEBOARD2
==============================================================================
--- stable/10/sys/arm/conf/CUBIEBOARD2 Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/CUBIEBOARD2 Sun May 24 14:25:03 2015 (r283368)
@@ -93,7 +93,7 @@ options ROOTDEVNAME=\"ufs:/dev/da0s2\"
# ATA controllers
#device ahci # AHCI-compatible SATA controllers
#device ata # Legacy ATA/SATA controllers
-#options ATA_STATIC_ID # Static device numbering
+#options ATA_STATIC_ID # Static device numbering
# Console and misc
device uart
Modified: stable/10/sys/arm/conf/DIGI-CCWMX53
==============================================================================
--- stable/10/sys/arm/conf/DIGI-CCWMX53 Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/DIGI-CCWMX53 Sun May 24 14:25:03 2015 (r283368)
@@ -22,7 +22,7 @@
include "IMX53"
ident DIGI-CCWMX53
-makeoptions WITHOUT_MODULES="ahc"
+makeoptions WITHOUT_MODULES="ahc"
# required for netbooting
#options BOOTP
@@ -34,5 +34,5 @@ makeoptions WITHOUT_MODULES="ahc"
#options ROOTDEVNAME=\"ufs:ada0s2a\"
# Flattened Device Tree
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=digi-ccwmx53.dts
+options FDT_DTB_STATIC
+makeoptions FDT_DTS_FILE=digi-ccwmx53.dts
Modified: stable/10/sys/arm/conf/DOCKSTAR
==============================================================================
--- stable/10/sys/arm/conf/DOCKSTAR Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/DOCKSTAR Sun May 24 14:25:03 2015 (r283368)
@@ -58,12 +58,12 @@ device faith # IPv6-to-IPv4 relaying
device firmware # firmware(9) required for USB wlan
device gif # IPv6 and IPv4 tunneling
device loop # Network loopback
-device md # Memory/malloc disk
+device md # Memory/malloc disk
device pty # BSD-style compatibility pseudo ttys
device random # Entropy device
-device tun # Packet tunnel.
+device tun # Packet tunnel.
device ether # Required for all ethernet devices
-device vlan # 802.1Q VLAN support
+device vlan # 802.1Q VLAN support
device wlan # 802.11 WLAN support
# cam support for umass and ahci
@@ -81,66 +81,66 @@ device e1000phy
# USB
options USB_HOST_ALIGN=32 # Align DMA to cacheline
-#options USB_DEBUG # Compile in USB debug support
-device usb # Basic usb support
-device ehci # USB host controller
-device umass # Mass storage
-device uhid # Human-interface devices
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zb1211/zb1211b wireless NICs
-device urtw # Realtek RTL8187B/L USB
-device upgt # Conexant/Intersil PrismGT SoftMAC USB
-device u3g # USB-based 3G modems (Option, Huawei, Sierra)
+#options USB_DEBUG # Compile in USB debug support
+device usb # Basic usb support
+device ehci # USB host controller
+device umass # Mass storage
+device uhid # Human-interface devices
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
+device urtw # Realtek RTL8187B/L USB
+device upgt # Conexant/Intersil PrismGT SoftMAC USB
+device u3g # USB-based 3G modems (Option, Huawei, Sierra)
# I2C (TWSI)
device iic
device iicbus
# Sound
-device sound
-device snd_uaudio
+device sound
+device snd_uaudio
#crypto
-device cesa # Marvell security engine
-device crypto
-device cryptodev
+device cesa # Marvell security engine
+device crypto
+device cryptodev
# IPSec
-device enc
-options IPSEC
-options IPSEC_NAT_T
-options TCP_SIGNATURE # include support for RFC 2385
+device enc
+options IPSEC
+options IPSEC_NAT_T
+options TCP_SIGNATURE # include support for RFC 2385
# IPFW
-options IPFIREWALL
-options IPFIREWALL_DEFAULT_TO_ACCEPT
-options IPFIREWALL_VERBOSE
-options IPFIREWALL_VERBOSE_LIMIT=100
-options IPFIREWALL_NAT
-options LIBALIAS
-options DUMMYNET
-options IPDIVERT
+options IPFIREWALL
+options IPFIREWALL_DEFAULT_TO_ACCEPT
+options IPFIREWALL_VERBOSE
+options IPFIREWALL_VERBOSE_LIMIT=100
+options IPFIREWALL_NAT
+options LIBALIAS
+options DUMMYNET
+options IPDIVERT
#PF
-device pf
-device pflog
-device pfsync
+device pf
+device pflog
+device pfsync
# ALTQ, required for PF
-options ALTQ # Basic ALTQ support
-options ALTQ_CBQ # Class Based Queueing
-options ALTQ_RED # Random Early Detection
-options ALTQ_RIO # RED In/Out
-options ALTQ_HFSC # Hierarchical Packet Scheduler
-options ALTQ_CDNR # Traffic conditioner
-options ALTQ_PRIQ # Priority Queueing
-options ALTQ_NOPCC # Required if the TSC is unusable
+options ALTQ # Basic ALTQ support
+options ALTQ_CBQ # Class Based Queueing
+options ALTQ_RED # Random Early Detection
+options ALTQ_RIO # RED In/Out
+options ALTQ_HFSC # Hierarchical Packet Scheduler
+options ALTQ_CDNR # Traffic conditioner
+options ALTQ_PRIQ # Priority Queueing
+options ALTQ_NOPCC # Required if the TSC is unusable
#options ALTQ_DEBUG
# Debugging
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options BREAK_TO_DEBUGGER
options ALT_BREAK_TO_DEBUGGER
options DDB
Modified: stable/10/sys/arm/conf/DREAMPLUG-1001
==============================================================================
--- stable/10/sys/arm/conf/DREAMPLUG-1001 Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/DREAMPLUG-1001 Sun May 24 14:25:03 2015 (r283368)
@@ -58,22 +58,22 @@ options FDT_DTB_STATIC
# Misc pseudo devices
device bpf # Required for DHCP
device faith # IPv6-to-IPv4 relaying (translation)
-device firmware # firmware(9) required for USB wlan
-device gif # IPv6 and IPv4 tunneling
+device firmware # firmware(9) required for USB wlan
+device gif # IPv6 and IPv4 tunneling
device loop # Network loopback
-device md # Memory/malloc disk
+device md # Memory/malloc disk
device pty # BSD-style compatibility pseudo ttys
device random # Entropy device
-device tun # Packet tunnel.
+device tun # Packet tunnel.
device ether # Required for all ethernet devices
-device vlan # 802.1Q VLAN support
+device vlan # 802.1Q VLAN support
device wlan # 802.11 WLAN support
# cam support for umass and ahci
device scbus
device pass
device da
-device cd
+device cd
# Serial ports
device uart
@@ -85,18 +85,18 @@ device e1000phy
# USB
options USB_HOST_ALIGN=32 # Align DMA to cacheline
-#options USB_DEBUG # Compile in USB debug support
-device usb # Basic usb support
-device ehci # USB host controller
-device umass # Mass storage
-device uhid # Human-interface devices
-device rum # Ralink Technology RT2501USB wireless NICs
-device uath # Atheros AR5523 wireless NICs
-device ural # Ralink Technology RT2500USB wireless NICs
-device zyd # ZyDAS zb1211/zb1211b wireless NICs
-device urtw # Realtek RTL8187B/L USB
-device upgt # Conexant/Intersil PrismGT SoftMAC USB
-device u3g # USB-based 3G modems (Option, Huawei, Sierra)
+#options USB_DEBUG # Compile in USB debug support
+device usb # Basic usb support
+device ehci # USB host controller
+device umass # Mass storage
+device uhid # Human-interface devices
+device rum # Ralink Technology RT2501USB wireless NICs
+device uath # Atheros AR5523 wireless NICs
+device ural # Ralink Technology RT2500USB wireless NICs
+device zyd # ZyDAS zb1211/zb1211b wireless NICs
+device urtw # Realtek RTL8187B/L USB
+device upgt # Conexant/Intersil PrismGT SoftMAC USB
+device u3g # USB-based 3G modems (Option, Huawei, Sierra)
# I2C (TWSI)
device iic
@@ -107,48 +107,48 @@ device mvs
device ahci
# Sound
-device sound
-device snd_uaudio
+device sound
+device snd_uaudio
#crypto
-device cesa # Marvell security engine
-device crypto
-device cryptodev
+device cesa # Marvell security engine
+device crypto
+device cryptodev
# IPSec
-device enc
-options IPSEC
-options IPSEC_NAT_T
-options TCP_SIGNATURE # include support for RFC 2385
+device enc
+options IPSEC
+options IPSEC_NAT_T
+options TCP_SIGNATURE # include support for RFC 2385
# IPFW
-options IPFIREWALL
-options IPFIREWALL_DEFAULT_TO_ACCEPT
-options IPFIREWALL_VERBOSE
-options IPFIREWALL_VERBOSE_LIMIT=100
-options IPFIREWALL_NAT
-options LIBALIAS
-options DUMMYNET
-options IPDIVERT
+options IPFIREWALL
+options IPFIREWALL_DEFAULT_TO_ACCEPT
+options IPFIREWALL_VERBOSE
+options IPFIREWALL_VERBOSE_LIMIT=100
+options IPFIREWALL_NAT
+options LIBALIAS
+options DUMMYNET
+options IPDIVERT
#PF
-device pf
-device pflog
-device pfsync
+device pf
+device pflog
+device pfsync
# ALTQ, required for PF
-options ALTQ # Basic ALTQ support
-options ALTQ_CBQ # Class Based Queueing
-options ALTQ_RED # Random Early Detection
-options ALTQ_RIO # RED In/Out
-options ALTQ_HFSC # Hierarchical Packet Scheduler
-options ALTQ_CDNR # Traffic conditioner
-options ALTQ_PRIQ # Priority Queueing
-options ALTQ_NOPCC # Required if the TSC is unusable
+options ALTQ # Basic ALTQ support
+options ALTQ_CBQ # Class Based Queueing
+options ALTQ_RED # Random Early Detection
+options ALTQ_RIO # RED In/Out
+options ALTQ_HFSC # Hierarchical Packet Scheduler
+options ALTQ_CDNR # Traffic conditioner
+options ALTQ_PRIQ # Priority Queueing
+options ALTQ_NOPCC # Required if the TSC is unusable
#options ALTQ_DEBUG
# Debugging
-makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
+makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
options BREAK_TO_DEBUGGER
options ALT_BREAK_TO_DEBUGGER
options DDB
@@ -179,7 +179,7 @@ options ROOTDEVNAME=\"ufs:/dev/da1s1a\"
# create a kernel config file that looks like this:
#
# include DREAMPLUG-1001
-# nomakeoptions FDT_DTS_FILE
+# nomakeoptions FDT_DTS_FILE
# makeoptions FDT_DTS_FILE=dreamplug-1001N.dts
# device nand
Modified: stable/10/sys/arm/conf/EFIKA_MX
==============================================================================
--- stable/10/sys/arm/conf/EFIKA_MX Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/EFIKA_MX Sun May 24 14:25:03 2015 (r283368)
@@ -22,7 +22,7 @@ ident EFIKA_MX
include "../freescale/imx/std.imx51"
-makeoptions WITHOUT_MODULES="ahc"
+makeoptions WITHOUT_MODULES="ahc"
options SCHED_4BSD # 4BSD scheduler
options PREEMPTION # Enable kernel thread preemption
@@ -187,7 +187,7 @@ makeoptions FDT_DTS_FILE=efikamx.dts
# Uncomment following lines for framebuffer/syscons support
device sc
device kbdmux
-options SC_DFLT_FONT # compile font in
-makeoptions SC_DFLT_FONT=cp437
+options SC_DFLT_FONT # compile font in
+makeoptions SC_DFLT_FONT=cp437
device ukbd # Allow keyboard like HIDs to control console
device ums
Modified: stable/10/sys/arm/conf/EXYNOS5.common
==============================================================================
--- stable/10/sys/arm/conf/EXYNOS5.common Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/EXYNOS5.common Sun May 24 14:25:03 2015 (r283368)
@@ -99,8 +99,8 @@ device gpio
options USB_HOST_ALIGN=64 # Align usb buffers to cache line size.
device usb
options USB_DEBUG
-#options USB_REQ_DEBUG
-#options USB_VERBOSE
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
#device musb
device ehci
#device ohci
Modified: stable/10/sys/arm/conf/HL201
==============================================================================
--- stable/10/sys/arm/conf/HL201 Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/HL201 Sun May 24 14:25:03 2015 (r283368)
@@ -133,5 +133,5 @@ device nand # NAND interface on CS3
#makeoptions FDT_DTS_FILE=hl201.dts
options EARLY_PRINTF
-options SOCDEV_PA=0xfc000000
+options SOCDEV_PA=0xfc000000
options SOCDEV_VA=0xdc000000
Modified: stable/10/sys/arm/conf/IMX53
==============================================================================
--- stable/10/sys/arm/conf/IMX53 Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/IMX53 Sun May 24 14:25:03 2015 (r283368)
@@ -170,5 +170,5 @@ options FDT # Configure using FDT/DTB
#device sc
#device vt
#device kbdmux
-#options SC_DFLT_FONT # compile font in
-#makeoptions SC_DFLT_FONT=cp437
+#options SC_DFLT_FONT # compile font in
+#makeoptions SC_DFLT_FONT=cp437
Modified: stable/10/sys/arm/conf/IMX53-QSB
==============================================================================
--- stable/10/sys/arm/conf/IMX53-QSB Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/IMX53-QSB Sun May 24 14:25:03 2015 (r283368)
@@ -34,5 +34,5 @@ options HZ=250 # 4ms scheduling quant
#options ROOTDEVNAME=\"ufs:ada0s2a\"
# Flattened Device Tree
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=imx53-qsb.dts
+options FDT_DTB_STATIC
+makeoptions FDT_DTS_FILE=imx53-qsb.dts
Modified: stable/10/sys/arm/conf/IMX6
==============================================================================
--- stable/10/sys/arm/conf/IMX6 Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/IMX6 Sun May 24 14:25:03 2015 (r283368)
@@ -98,7 +98,7 @@ device miibus # Required for ethernet
device bpf # Berkeley packet filter (required for DHCP)
# General-purpose input/output
-device gpio
+device gpio
# Serial (COM) ports
device uart # Multi-uart driver
Modified: stable/10/sys/arm/conf/SAM9260EK
==============================================================================
--- stable/10/sys/arm/conf/SAM9260EK Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/SAM9260EK Sun May 24 14:25:03 2015 (r283368)
@@ -181,5 +181,5 @@ device nand # NAND interface on CS3
#makeoptions FDT_DTS_FILE=sam9260ek.dts
options EARLY_PRINTF
-options SOCDEV_PA=0xfc000000
+options SOCDEV_PA=0xfc000000
options SOCDEV_VA=0xdc000000
Modified: stable/10/sys/arm/conf/VERSATILEPB
==============================================================================
--- stable/10/sys/arm/conf/VERSATILEPB Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/VERSATILEPB Sun May 24 14:25:03 2015 (r283368)
@@ -106,8 +106,8 @@ device pass # Passthrough device (dir
# Comment following lines for headless setup
device sc
device kbdmux
-options SC_DFLT_FONT # compile font in
-makeoptions SC_DFLT_FONT=cp437
+options SC_DFLT_FONT # compile font in
+makeoptions SC_DFLT_FONT=cp437
options KDB
options DDB # Enable the kernel debugger
Modified: stable/10/sys/arm/conf/VYBRID
==============================================================================
--- stable/10/sys/arm/conf/VYBRID Sun May 24 12:33:12 2015 (r283367)
+++ stable/10/sys/arm/conf/VYBRID Sun May 24 14:25:03 2015 (r283368)
@@ -110,8 +110,8 @@ device gpio
options USB_HOST_ALIGN=32 # Align usb buffers to cache line size.
device usb
options USB_DEBUG
-#options USB_REQ_DEBUG
-#options USB_VERBOSE
+#options USB_REQ_DEBUG
+#options USB_VERBOSE
#device musb
device ehci
#device ohci
More information about the svn-src-stable-10
mailing list