--- elwix/config/ELWIX_ALFA_N2	2014/01/16 14:43:02	1.1.2.8
+++ elwix/config/ELWIX_ALFA_N2	2014/02/08 16:40:31	1.1.2.21
@@ -9,20 +9,22 @@ machine		mips mips
 ident		ELWIX_ALFA_N2
 # XXX The default load address in the Uboot environment is 0x80010000
 makeoptions	KERNLOADADDR=0x80050000
-options		HZ=1000
+options		HZ=100
 options		HWPMC_HOOKS
+device		hwpmc
+device		hwpmc_mips24k
 
 # 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_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
 
-#device		etherswitch
-#device		arswitch
+device		etherswitch
+device		arswitch
 
 hints		"ELWIX_ALFA_N2.hints"
 include		"../atheros/std.ar71xx"
@@ -33,10 +35,11 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug 
 #options		DDB
 #options		KDB
 
-options		SCHED_4BSD		#4BSD scheduler
+options 	PREEMPTION		# Enable kernel thread preemption
+options 	SCHED_ULE		# ULE scheduler
+#options		SCHED_4BSD		#4BSD scheduler
 options		INET			#InterNETworking
 options		INET6
-# options		NFSCL			#Network Filesystem Client
 options		PSEUDOFS		#Pseudo-filesystem framework
 options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options		ALQ
@@ -47,7 +50,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
@@ -64,11 +73,12 @@ device		ar724x_pci
 # NVRAM U-Boot Environment -> Kernel environment
 device		nvram2env
 
+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
@@ -78,10 +88,10 @@ device		nvram2env
 
 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
+#options		IEEE80211_DEBUG
 options		IEEE80211_SUPPORT_MESH
 options		IEEE80211_SUPPORT_SUPERG
 options		IEEE80211_AMPDU_AGE
@@ -100,7 +110,7 @@ device		wlan_rssadapt
 device		ath             # Atheros interface support
 device		ath_pci		# Atheros PCI/Cardbus bus
 device		ath_ahb
-options 	ATH_DEBUG
+#options 	ATH_DEBUG
 options		ATH_ENABLE_11N
 options		ATH_DIAGAPI
 
@@ -111,41 +121,50 @@ options		AH_DEBUG_ALQ
 
 #option		AH_SUPPORT_AR9130	# Makes other chipsets not function!
 device		ath_rate_sample
-#options		AH_RXCFG_SDMAMW_4BYTES
+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.
-#option		ATH_ENABLE_DFS
+option		ATH_ENABLE_DFS
 
 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_DEBUG	# Enable if_arge debugging for now
+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
+#device		usb
 options		USB_EHCI_BIG_ENDIAN_DESC        # handle big-endian byte order
 #options		USB_DEBUG
 options		USB_HOST_ALIGN=32
-device		ehci
+#device		ehci
 
 # Mass storage
-device		scbus
-device		umass
-device		da
+#device		scbus
+#device		umass
+#device		da
 
 # Read MSDOS formatted disks
 options		GEOM_PART_BSD
 options		GEOM_PART_MBR
-options		MSDOSFS
 
+options 	NULLFS
+options 	UNIONFS
+#options 	TMPFS
+#options	MSDOSFS
+
 # GPIO Bus
 device		gpio
 device		gpioled
+device		gpioiic
 
+device		iicbb
+device		iicbus
+device		iic
+
 # SPI and flash
 device		spibus
 device		ar71xx_spi
@@ -160,20 +179,28 @@ device		ar71xx_wdog
 device		uart
 device		uart_ar71xx
 
-device		pty
-
 # 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
 
-options		MSGBUF_SIZE=65536
-options		SHMALL=128
-options		NSFBUFS=1024
-options		MAXFILES=512
-options		MAXUSERS=3
+device		pf
+device		pflog
+device		pfsync
+
+options 	P1003_1B_MQUEUE
+options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
+
+#options		MSGBUF_SIZE=65536
+#options		SHMALL=128
+#options		NSFBUFS=1024
+#options		MAXFILES=512
+#options		MAXUSERS=3