--- elwix/config/ELWIX_ALFA_N2	2014/01/14 20:14:20	1.1.2.5
+++ elwix/config/ELWIX_ALFA_N2	2014/01/24 02:42:27	1.1.2.15
@@ -11,18 +11,19 @@ ident		ELWIX_ALFA_N2
 makeoptions	KERNLOADADDR=0x80050000
 options		HZ=1000
 options		HWPMC_HOOKS
+device		hwpmc
 
 # The PB92 has 32mb of RAM; hard-code that
 options		AR71XX_REALMEM=32*1024*1024
 
 # It's UBOOT, not Redboot - without this, things will hang at startup
 options		AR71XX_ENV_UBOOT
-#options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
-#options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
-#device		firmware		# Used by the above
+options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
+options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
+device		firmware		# Used by the above
 
 device		etherswitch
-#device		arswitch
+device		arswitch
 
 hints		"ELWIX_ALFA_N2.hints"
 include		"../atheros/std.ar71xx"
@@ -30,14 +31,12 @@ include		"../atheros/std.ar71xx"
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 #makeoptions	MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci hwpmc cam zlib"
 
-options		DDB
+#options		DDB
 #options		KDB
 
 options		SCHED_4BSD		#4BSD scheduler
 options		INET			#InterNETworking
-# Can't do IPv6 - it just doesn't fit.
-# options		INET6
-# options		NFSCL			#Network Filesystem Client
+options		INET6
 options		PSEUDOFS		#Pseudo-filesystem framework
 options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options		ALQ
@@ -48,7 +47,13 @@ options		ALQ
 #options		INVARIANT_SUPPORT
 #options		WITNESS
 #options		WITNESS_SKIPSPIN
+
+# Don't include the SCSI/CAM strings in the default build
+options 	SCSI_NO_SENSE_STRINGS
+options 	SCSI_NO_OP_STRINGS
+
 options         FFS                     #Berkeley Fast Filesystem
+options 	NO_FFS_SNAPSHOT
 #options         SOFTUPDATES             #Enable FFS soft updates support
 #options         UFS_ACL                 #Support for access control lists
 #options         UFS_DIRHASH             #Improve performance on big directories
@@ -65,13 +70,12 @@ device		ar724x_pci
 # NVRAM U-Boot Environment -> Kernel environment
 device		nvram2env
 
-options 	MD_ROOT			# MD is a potential root device
-
+options 	NFSCL			# New Network Filesystem Client
 #options 	NFSD			# New Network Filesystem Server
-#options 	NFSCLIENT		#Network File System client
+options 	NFSCLIENT		#Network File System client
 #options 	NFSSERVER		#Network File System server
-#options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCL
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 #options 	BOOTP			# Use BOOTP to obtain IP address/hostname
 					# Requires NFSCLIENT and NFS_ROOT
 #options 	BOOTP_NFSROOT		# NFS mount root filesystem using BOOTP info
@@ -81,7 +85,7 @@ options 	MD_ROOT			# MD is a potential root device
 
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_UZIP
-device		geom_uzip	# compressed in-memory filesystem support
+device		geom_uzip		# compressed in-memory filesystem support
 
 # Wireless NIC cards
 options		IEEE80211_DEBUG
@@ -107,16 +111,15 @@ options 	ATH_DEBUG
 options		ATH_ENABLE_11N
 options		ATH_DIAGAPI
 
-# device		ath_hal
+device		ath_hal
 options		AH_SUPPORT_AR5416
 options		AH_DEBUG
 options		AH_DEBUG_ALQ
 
-device		ath_hal
 #option		AH_SUPPORT_AR9130	# Makes other chipsets not function!
 device		ath_rate_sample
-option		AH_RXCFG_SDMAMW_4BYTES
-option		AH_AR5416_INTERRUPT_MITIGATION
+options		AH_RXCFG_SDMAMW_4BYTES
+options		AH_AR5416_INTERRUPT_MITIGATION
 # There's no DFS radar detection support yet so this won't actually
 # detect radars.  It however does enable the rest of the channel change
 # machinery so DFS can be debugged.
@@ -125,9 +128,11 @@ option		AH_AR5416_INTERRUPT_MITIGATION
 device		mii
 device		arge
 #options 	ARGE_DEBUG	# Enable if_arge debugging for now
-#options 	ARGE_MDIO		# Export an MDIO bus separate from arge
-#device		miiproxy		# MDIO bus <-> MII PHY rendezvous
+options 	ARGE_MDIO		# Export an MDIO bus separate from arge
+device		miiproxy		# MDIO bus <-> MII PHY rendezvous
 
+# USB devices - PB92 has EHCI only
+
 #device		usb
 options		USB_EHCI_BIG_ENDIAN_DESC        # handle big-endian byte order
 #options		USB_DEBUG
@@ -140,8 +145,14 @@ device		scbus
 device		da
 
 # Read MSDOS formatted disks
-options		MSDOSFS
+options		GEOM_PART_BSD
+options		GEOM_PART_MBR
 
+options 	NULLFS
+options 	UNIONFS
+#options 	TMPFS
+#options	MSDOSFS
+
 # GPIO Bus
 device		gpio
 device		gpioled
@@ -163,9 +174,26 @@ device		uart_ar71xx
 # Network twiddling
 device		loop
 device		ether
+device		vlan
 device		md
 device		bpf
 device		random
 device		if_bridge
 device		gif		# ip[46] in ip[46] tunneling protocol
 device		gre		# generic encapsulation - only for IPv4 in IPv4 though atm
+device		tun
+device		tap
+
+device		pf
+device		pflog
+device		pfsync
+
+options 	P1003_1B_MQUEUE
+options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+
+options		MSGBUF_SIZE=65536
+options		SHMALL=128
+options		NSFBUFS=1024
+options		MAXFILES=512
+options		MAXUSERS=3