Include a pfSense for the ClearFog.

(cherry picked from commit 839fcfcd847014b820769963d1518dd0a93fde18)

5 files changed, 228 insertions, 290 deletions

diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X
index a9d6971..d64fd9a 100644
--- a/sys/arm/conf/ARMADA38X
+++ b/sys/arm/conf/ARMADA38X
@@ -24,22 +24,13 @@ options 	SMP
 
 options		VM_KMEM_SIZE_MAX=0x9CCD000
 
-# Pseudo devices
-device		random
-device		pty
-device		loop
-device		md
-
 # Serial ports
 device		uart
 device		uart_snps
 
 # Network
 device		ether
-device		vlan
-device		mii
 device		bpf
-device		re
 device		mdio
 device		etherswitch
 device		e6000sw
@@ -64,6 +55,9 @@ device		scbus
 device		pass
 device		da
 
+# USB ethernet support, requires miibus
+device		miibus
+
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
@@ -77,13 +71,44 @@ device		iic
 device		iicbus
 device		twsi
 
-# Wireless NIC cards
-device		wlan		# 802.11 support
-device		ath		# Atheros NIC's
-device		ath_pci		# Atheros pci/cardbus glue
-device		ath_hal
-device		ath_rate_sample
-options		ATH_ENABLE_11N
+# Wireless NIC cards                    
+device		wlan			# 802.11 support
+options 	IEEE80211_DEBUG		# enable debug msgs
+options 	IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
+options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft 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		an			# Aironet 4500/4800 802.11 wireless NICs.
+device		ath			# Atheros NICs
+device		ath_pci			# Atheros pci/cardbus glue
+device		ath_hal			# pci/cardbus chip support
+options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
+options 	AH_AR5416_INTERRUPT_MITIGATION	# AR5416 interrupt mitigation
+options 	ATH_ENABLE_11N		# Enable 802.11n support for AR5416 and later
+device		ath_rate_sample		# SampleRate tx rate control for ath
+#device		bwi			# Broadcom BCM430x/BCM431x wireless NICs.
+#device		bwn			# Broadcom BCM43xx wireless NICs.
+device		ipw			# Intel 2100 wireless NICs.
+device		iwi			# Intel 2200BG/2225BG/2915ABG wireless NICs.
+device		iwn			# Intel 4965/1000/5000/6000 wireless NICs.
+device		malo			# Marvell Libertas wireless NICs.
+device		mwl			# Marvell 88W8363 802.11n wireless NICs.
+device		ral			# Ralink Technology RT2500 wireless NICs. 
+device		wi			# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
+device		wpi			# Intel 3945ABG wireless NICs.
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		vlan			# 802.1Q VLAN support
+device		tun			# Packet tunnel.
+device		md			# Memory "disks"
+device		gif			# IPv6 and IPv4 tunneling
+device		firmware		# firmware assist module
+device		pty
 
 # CESA
 device		cesa
@@ -95,3 +120,28 @@ device		pl310
 
 # FDT
 options 	FDT
+<<<<<<< HEAD
+=======
+options 	FDT_DTB_STATIC
+makeoptions 	FDT_DTS_FILE=armada-388-clearfog.dts
+
+# HWPMC
+#device hwpmc
+#options HWPMC_HOOKS
+
+
+# Watchdog support
+# If we don't enable the watchdog driver, the system could potentially
+# reboot automatically because the boot loader might have enabled the
+# watchdog.
+device		ti_wdt
+
+# Mailbox support
+device		ti_mbox
+
+# PMU support (for CCNT).
+device		pmu
+
+# Netmap provides direct access to TX/RX rings on supported NICs
+#device		netmap			# netmap(4) support
+>>>>>>> 839fcfc... Include a pfSense for the ClearFog.
diff --git a/sys/arm/conf/pfSense b/sys/arm/conf/pfSense
new file mode 100644
index 0000000..004f4c0
--- /dev/null
+++ b/sys/arm/conf/pfSense
@@ -0,0 +1,156 @@
+include		uFW
+
+nooptions	KDB_TRACE
+
+ident		pfSense-uFW
+
+nooptions	MAC		# TrustedBSD MAC Framework
+nooptions	COMPAT_FREEBSD4	# Compatible with FreeBSD4
+nooptions	COMPAT_FREEBSD5	# Compatible with FreeBSD5
+nooptions	COMPAT_FREEBSD6	# Compatible with FreeBSD6
+nooptions	COMPAT_FREEBSD7	# Compatible with FreeBSD7
+
+options		GEOM_MIRROR
+options		GEOM_UZIP
+options		GEOM_ELI
+options		GEOM_BDE
+
+options 	TMPFS
+options		UNIONFS
+options		NULLFS
+options		PPS_SYNC
+
+# Wireless
+nooptions	IEEE80211_DEBUG	# enable debug msgs
+device		wlan_rssadapt
+device		wlan_xauth
+device		wlan_acl
+device		iwifw
+device		ipwfw		# Firmware for Intel PRO/Wireless 2100 IEEE 802.11 driver
+device		wpifw		# Firmware for Intel 3945ABG Wireless LAN IEEE 802.11 driver
+device		iwnfw		# Firmware for Intel Wireless WiFi Link 4965AGN IEEE 802.11n driver
+device		uath		# Atheros USB IEEE 802.11a/b/g wireless network device
+device		ralfw		# Firmware for Ralink Technology RT2500 wireless NICs.
+device		ural		# Ralink Technology RT2500USB IEEE 802.11 driver
+device		urtw		# Realtek RTL8187B/L USB IEEE 802.11b/g wireless network device
+device		rum		# Ralink Technology USB IEEE 802.11a/b/g wireless network device
+device		mwlfw		# Firmware for Marvell 88W8363 IEEE 802.11n wireless network driver
+device		upgt		# Conexant/Intersil PrismGT SoftMAC USB IEEE 802.11b/g wireless
+device		udav		# Davicom DM9601 USB Ethernet driver
+device		axe
+device		axge
+device		aue
+device		cue
+device		kue
+device		mos
+device		rsu
+device		rsufw
+device		run		# Ralink RT2700U/RT2800U/RT3000U USB 802.11agn
+device		runfw
+device		rue
+#device		rtwn
+#device		urtwnfw
+device		bwn		# Broadcom BCM43xx IEEE 802.11b/g wireless network driver
+device		bwi		# Broadcom BCM43xx IEEE 802.11b/g wireless network driver
+
+# USB support
+nooptions	USB_DEBUG	# enable debug msgs
+
+# 3G devices
+device		ufoma
+device		ucom
+device		uslcom
+device		uplcom
+device		umct
+device		uvisor
+device		uark
+device		uftdi
+device		uvscom
+device		umodem
+device		u3g
+device		cdce
+
+device		uhid		# "Human Interface Devices"
+
+# pfsense addons
+
+device		tap
+device		gre
+device		if_bridge
+device		carp
+device		lagg
+device		vte
+
+# IP/IPFW
+options		IPFIREWALL_DEFAULT_TO_ACCEPT
+options		IPFIREWALL_VERBOSE
+options		IPSTEALTH
+
+# Netgraph
+options		NETGRAPH		#netgraph(4) system
+options		NETGRAPH_VLAN
+options		NETGRAPH_L2TP
+options		NETGRAPH_BPF
+options		NETGRAPH_ETHER
+options		NETGRAPH_IFACE
+options		NETGRAPH_EIFACE
+options		NETGRAPH_PPP
+options		NETGRAPH_PPPOE
+options		NETGRAPH_PPTPGRE
+options		NETGRAPH_RFC1490
+options		NETGRAPH_SOCKET
+options		NETGRAPH_TTY
+options		NETGRAPH_MPPC_ENCRYPTION
+options		NETGRAPH_UI
+options		NETGRAPH_VJC
+options		NETGRAPH_KSOCKET
+options		NETGRAPH_LMI
+options		NETGRAPH_ONE2MANY
+options		NETGRAPH_BRIDGE
+options		NETGRAPH_CISCO
+options		NETGRAPH_ECHO
+options		NETGRAPH_ASYNC
+options		NETGRAPH_FRAME_RELAY
+options		NETGRAPH_HOLE
+options		NETGRAPH_TEE
+options		NETGRAPH_TCPMSS
+options		NETGRAPH_PIPE
+options		NETGRAPH_CAR
+options		NETGRAPH_DEFLATE
+options		NETGRAPH_PRED1
+
+# IPSEC
+options		IPSEC_NAT_T
+options		TCP_SIGNATURE
+device		enc
+
+# ALTQ
+options		ALTQ
+options		ALTQ_CBQ
+options		ALTQ_RED
+options		ALTQ_RIO
+options		ALTQ_HFSC
+options		ALTQ_PRIQ
+options		ALTQ_FAIRQ
+options		ALTQ_NOPCC
+options		ALTQ_CODEL
+
+# Squid related settings
+options		MSGMNB=8192	# max # of bytes in a queue
+options		MSGMNI=40	# number of message queue identifiers
+options		MSGSEG=512	# number of message segments per queue
+options		MSGSSZ=32	# size of a message segment
+options		MSGTQL=2048	# max messages in system
+
+device		pf
+device		pflog
+device		pfsync
+
+device		rndtest		# FIPS 140-2 entropy tester
+device		hifn		# Hifn 7951, 7781, etc.
+options		HIFN_DEBUG	# enable debugging support: hw.hifn.debug
+options		HIFN_RNDTEST	# enable rndtest support
+device		ubsec		# Broadcom 5501, 5601, 58xx
+device		safe		# safe -- SafeNet crypto accelerator
+
+options		MROUTING
diff --git a/sys/arm/conf/pfSense-ClearFog b/sys/arm/conf/pfSense-ClearFog
new file mode 100644
index 0000000..374fed1
--- /dev/null
+++ b/sys/arm/conf/pfSense-ClearFog
@@ -0,0 +1,4 @@
+include		ARMADA38X
+include		pfSense
+
+ident		pfSense-Clearfog
diff --git a/sys/arm/conf/pfSense-uBMC b/sys/arm/conf/pfSense-uBMC
index 6d7e1c2..cdcd25b 100644
--- a/sys/arm/conf/pfSense-uBMC
+++ b/sys/arm/conf/pfSense-uBMC
@@ -1,124 +1,4 @@
 include		uBMC
-
-nooptions	KDB_TRACE
+include		pfSense
 
 ident		pfSense-uBMC
-
-nooptions	MAC		# TrustedBSD MAC Framework
-nooptions	COMPAT_FREEBSD4	# Compatible with FreeBSD4
-nooptions	COMPAT_FREEBSD5	# Compatible with FreeBSD5
-nooptions	COMPAT_FREEBSD6	# Compatible with FreeBSD6
-nooptions	COMPAT_FREEBSD7	# Compatible with FreeBSD7
-
-options		GEOM_MIRROR
-options		GEOM_UZIP
-options		GEOM_ELI
-options		GEOM_BDE
-
-options		UNIONFS
-options		NULLFS
-options		PPS_SYNC
-
-# USB support
-nooptions	USB_DEBUG	# enable debug msgs
-
-# 3G devices
-device		ufoma
-device		ucom
-device		uslcom
-device		uplcom
-device		umct
-device		uvisor
-device		uark
-device		uftdi
-device		uvscom
-device		umodem
-device		u3g
-device		cdce
-
-device		uhid		# "Human Interface Devices"
-
-# pfsense addons
-
-device		tap
-device		gre
-device		if_bridge
-device		carp
-device		lagg
-device		vte
-
-# IP/IPFW
-options		IPFIREWALL_DEFAULT_TO_ACCEPT
-options		IPFIREWALL_VERBOSE
-options		IPSTEALTH
-
-# Netgraph
-options		NETGRAPH		#netgraph(4) system
-options		NETGRAPH_VLAN
-options		NETGRAPH_L2TP
-options		NETGRAPH_BPF
-options		NETGRAPH_ETHER
-options		NETGRAPH_IFACE
-options		NETGRAPH_EIFACE
-options		NETGRAPH_PPP
-options		NETGRAPH_PPPOE
-options		NETGRAPH_PPTPGRE
-options		NETGRAPH_RFC1490
-options		NETGRAPH_SOCKET
-options		NETGRAPH_TTY
-options		NETGRAPH_MPPC_ENCRYPTION
-options		NETGRAPH_UI
-options		NETGRAPH_VJC
-options		NETGRAPH_KSOCKET
-options		NETGRAPH_LMI
-options		NETGRAPH_ONE2MANY
-options		NETGRAPH_BRIDGE
-options		NETGRAPH_CISCO
-options		NETGRAPH_ECHO
-options		NETGRAPH_ASYNC
-options		NETGRAPH_FRAME_RELAY
-options		NETGRAPH_HOLE
-options		NETGRAPH_TEE
-options		NETGRAPH_TCPMSS
-options		NETGRAPH_PIPE
-options		NETGRAPH_CAR
-options		NETGRAPH_DEFLATE
-options		NETGRAPH_PRED1
-
-# IPSEC
-options		IPSEC_NAT_T
-options		TCP_SIGNATURE
-device		enc
-
-# ALTQ
-options		ALTQ
-options		ALTQ_CBQ
-options		ALTQ_RED
-options		ALTQ_RIO
-options		ALTQ_HFSC
-options		ALTQ_PRIQ
-options		ALTQ_FAIRQ
-options		ALTQ_NOPCC
-options		ALTQ_CODEL
-
-# Squid related settings
-options		MSGMNB=8192	# max # of bytes in a queue
-options		MSGMNI=40	# number of message queue identifiers
-options		MSGSEG=512	# number of message segments per queue
-options		MSGSSZ=32	# size of a message segment
-options		MSGTQL=2048	# max messages in system
-
-device		pf
-device		pflog
-device		pfsync
-
-device		rndtest		# FIPS 140-2 entropy tester
-device		hifn		# Hifn 7951, 7781, etc.
-options		HIFN_DEBUG	# enable debugging support: hw.hifn.debug
-options		HIFN_RNDTEST	# enable rndtest support
-device		ubsec		# Broadcom 5501, 5601, 58xx
-device		safe		# safe -- SafeNet crypto accelerator
-
-options		DEVICE_POLLING
-
-options		MROUTING
diff --git a/sys/arm/conf/pfSense-uFW b/sys/arm/conf/pfSense-uFW
index 004f4c0..4254b0f 100644
--- a/sys/arm/conf/pfSense-uFW
+++ b/sys/arm/conf/pfSense-uFW
@@ -1,156 +1,4 @@
 include		uFW
-
-nooptions	KDB_TRACE
+include		pfSense
 
 ident		pfSense-uFW
-
-nooptions	MAC		# TrustedBSD MAC Framework
-nooptions	COMPAT_FREEBSD4	# Compatible with FreeBSD4
-nooptions	COMPAT_FREEBSD5	# Compatible with FreeBSD5
-nooptions	COMPAT_FREEBSD6	# Compatible with FreeBSD6
-nooptions	COMPAT_FREEBSD7	# Compatible with FreeBSD7
-
-options		GEOM_MIRROR
-options		GEOM_UZIP
-options		GEOM_ELI
-options		GEOM_BDE
-
-options 	TMPFS
-options		UNIONFS
-options		NULLFS
-options		PPS_SYNC
-
-# Wireless
-nooptions	IEEE80211_DEBUG	# enable debug msgs
-device		wlan_rssadapt
-device		wlan_xauth
-device		wlan_acl
-device		iwifw
-device		ipwfw		# Firmware for Intel PRO/Wireless 2100 IEEE 802.11 driver
-device		wpifw		# Firmware for Intel 3945ABG Wireless LAN IEEE 802.11 driver
-device		iwnfw		# Firmware for Intel Wireless WiFi Link 4965AGN IEEE 802.11n driver
-device		uath		# Atheros USB IEEE 802.11a/b/g wireless network device
-device		ralfw		# Firmware for Ralink Technology RT2500 wireless NICs.
-device		ural		# Ralink Technology RT2500USB IEEE 802.11 driver
-device		urtw		# Realtek RTL8187B/L USB IEEE 802.11b/g wireless network device
-device		rum		# Ralink Technology USB IEEE 802.11a/b/g wireless network device
-device		mwlfw		# Firmware for Marvell 88W8363 IEEE 802.11n wireless network driver
-device		upgt		# Conexant/Intersil PrismGT SoftMAC USB IEEE 802.11b/g wireless
-device		udav		# Davicom DM9601 USB Ethernet driver
-device		axe
-device		axge
-device		aue
-device		cue
-device		kue
-device		mos
-device		rsu
-device		rsufw
-device		run		# Ralink RT2700U/RT2800U/RT3000U USB 802.11agn
-device		runfw
-device		rue
-#device		rtwn
-#device		urtwnfw
-device		bwn		# Broadcom BCM43xx IEEE 802.11b/g wireless network driver
-device		bwi		# Broadcom BCM43xx IEEE 802.11b/g wireless network driver
-
-# USB support
-nooptions	USB_DEBUG	# enable debug msgs
-
-# 3G devices
-device		ufoma
-device		ucom
-device		uslcom
-device		uplcom
-device		umct
-device		uvisor
-device		uark
-device		uftdi
-device		uvscom
-device		umodem
-device		u3g
-device		cdce
-
-device		uhid		# "Human Interface Devices"
-
-# pfsense addons
-
-device		tap
-device		gre
-device		if_bridge
-device		carp
-device		lagg
-device		vte
-
-# IP/IPFW
-options		IPFIREWALL_DEFAULT_TO_ACCEPT
-options		IPFIREWALL_VERBOSE
-options		IPSTEALTH
-
-# Netgraph
-options		NETGRAPH		#netgraph(4) system
-options		NETGRAPH_VLAN
-options		NETGRAPH_L2TP
-options		NETGRAPH_BPF
-options		NETGRAPH_ETHER
-options		NETGRAPH_IFACE
-options		NETGRAPH_EIFACE
-options		NETGRAPH_PPP
-options		NETGRAPH_PPPOE
-options		NETGRAPH_PPTPGRE
-options		NETGRAPH_RFC1490
-options		NETGRAPH_SOCKET
-options		NETGRAPH_TTY
-options		NETGRAPH_MPPC_ENCRYPTION
-options		NETGRAPH_UI
-options		NETGRAPH_VJC
-options		NETGRAPH_KSOCKET
-options		NETGRAPH_LMI
-options		NETGRAPH_ONE2MANY
-options		NETGRAPH_BRIDGE
-options		NETGRAPH_CISCO
-options		NETGRAPH_ECHO
-options		NETGRAPH_ASYNC
-options		NETGRAPH_FRAME_RELAY
-options		NETGRAPH_HOLE
-options		NETGRAPH_TEE
-options		NETGRAPH_TCPMSS
-options		NETGRAPH_PIPE
-options		NETGRAPH_CAR
-options		NETGRAPH_DEFLATE
-options		NETGRAPH_PRED1
-
-# IPSEC
-options		IPSEC_NAT_T
-options		TCP_SIGNATURE
-device		enc
-
-# ALTQ
-options		ALTQ
-options		ALTQ_CBQ
-options		ALTQ_RED
-options		ALTQ_RIO
-options		ALTQ_HFSC
-options		ALTQ_PRIQ
-options		ALTQ_FAIRQ
-options		ALTQ_NOPCC
-options		ALTQ_CODEL
-
-# Squid related settings
-options		MSGMNB=8192	# max # of bytes in a queue
-options		MSGMNI=40	# number of message queue identifiers
-options		MSGSEG=512	# number of message segments per queue
-options		MSGSSZ=32	# size of a message segment
-options		MSGTQL=2048	# max messages in system
-
-device		pf
-device		pflog
-device		pfsync
-
-device		rndtest		# FIPS 140-2 entropy tester
-device		hifn		# Hifn 7951, 7781, etc.
-options		HIFN_DEBUG	# enable debugging support: hw.hifn.debug
-options		HIFN_RNDTEST	# enable rndtest support
-device		ubsec		# Broadcom 5501, 5601, 58xx
-device		safe		# safe -- SafeNet crypto accelerator
-
-options		MROUTING