summaryrefslogtreecommitdiffstats
path: root/sys/arm
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2015-05-24 14:25:03 +0000
committerian <ian@FreeBSD.org>2015-05-24 14:25:03 +0000
commit8b432f3b56439ae8ed4274f59106ba727190427e (patch)
treedc2e952387d30eff2af3b119b355dc6a696cd3d2 /sys/arm
parent0d8ee7566b4bab2d197db6ce3ad8e5f4667ab319 (diff)
downloadFreeBSD-src-8b432f3b56439ae8ed4274f59106ba727190427e.zip
FreeBSD-src-8b432f3b56439ae8ed4274f59106ba727190427e.tar.gz
MFC r276004: Fix the indentation to simplify comparing the ARM config files.
Diffstat (limited to 'sys/arm')
-rw-r--r--sys/arm/conf/BEAGLEBONE2
-rw-r--r--sys/arm/conf/CNS11XXNAS6
-rw-r--r--sys/arm/conf/CUBIEBOARD2
-rw-r--r--sys/arm/conf/CUBIEBOARD22
-rw-r--r--sys/arm/conf/DIGI-CCWMX536
-rw-r--r--sys/arm/conf/DOCKSTAR88
-rw-r--r--sys/arm/conf/DREAMPLUG-100196
-rw-r--r--sys/arm/conf/EFIKA_MX6
-rw-r--r--sys/arm/conf/EXYNOS5.common4
-rw-r--r--sys/arm/conf/HL2012
-rw-r--r--sys/arm/conf/IMX534
-rw-r--r--sys/arm/conf/IMX53-QSB4
-rw-r--r--sys/arm/conf/IMX62
-rw-r--r--sys/arm/conf/SAM9260EK2
-rw-r--r--sys/arm/conf/VERSATILEPB4
-rw-r--r--sys/arm/conf/VYBRID4
16 files changed, 117 insertions, 117 deletions
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index 0be5949..822630d 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -77,7 +77,7 @@ options DDB # Enable the kernel debugger
#options DIAGNOSTIC
# NFS server support
-#options NFSD
+#options NFSD
# NFS root from boopt/dhcp
#options BOOTP
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
index 53640ff..903fd05 100644
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@@ -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\"
diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD
index 0debfea..278bb52 100644
--- a/sys/arm/conf/CUBIEBOARD
+++ b/sys/arm/conf/CUBIEBOARD
@@ -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
diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2
index 51e93d2..3cfb320 100644
--- a/sys/arm/conf/CUBIEBOARD2
+++ b/sys/arm/conf/CUBIEBOARD2
@@ -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
diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53
index 7756558..20dec9c 100644
--- a/sys/arm/conf/DIGI-CCWMX53
+++ b/sys/arm/conf/DIGI-CCWMX53
@@ -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
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index cd750e6..e966d2e 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -58,12 +58,12 @@ device faith # IPv6-to-IPv4 relaying (translation)
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
diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001
index 90bef4f..fdcf027 100644
--- a/sys/arm/conf/DREAMPLUG-1001
+++ b/sys/arm/conf/DREAMPLUG-1001
@@ -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
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index 5fd3074..6835be5 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -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
diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common
index 291d48c..df64dbb 100644
--- a/sys/arm/conf/EXYNOS5.common
+++ b/sys/arm/conf/EXYNOS5.common
@@ -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
diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
index f0f387c..347a71f 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -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
diff --git a/sys/arm/conf/IMX53 b/sys/arm/conf/IMX53
index c0910ac..91660f3 100644
--- a/sys/arm/conf/IMX53
+++ b/sys/arm/conf/IMX53
@@ -170,5 +170,5 @@ options FDT # Configure using FDT/DTB data
#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
diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB
index fdaa4ec..fdde591 100644
--- a/sys/arm/conf/IMX53-QSB
+++ b/sys/arm/conf/IMX53-QSB
@@ -34,5 +34,5 @@ options HZ=250 # 4ms scheduling quantum
#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
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 0c6d990..9725fb9 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -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
diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK
index 34b64af..44e59d3 100644
--- a/sys/arm/conf/SAM9260EK
+++ b/sys/arm/conf/SAM9260EK
@@ -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
diff --git a/sys/arm/conf/VERSATILEPB b/sys/arm/conf/VERSATILEPB
index aaa139c..380e595 100644
--- a/sys/arm/conf/VERSATILEPB
+++ b/sys/arm/conf/VERSATILEPB
@@ -106,8 +106,8 @@ device pass # Passthrough device (direct ATA/SCSI access)
# 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
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index 206ce46..7b1f09d 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -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
OpenPOWER on IntegriCloud