--- elwix/config/ELWIX_ALFA_N2	2014/01/20 00:04:35	1.1.2.10
+++ elwix/config/ELWIX_ALFA_N2	2014/01/24 02:42:27	1.1.2.15
@@ -10,7 +10,8 @@ ident		ELWIX_ALFA_N2
 # XXX The default load address in the Uboot environment is 0x80010000
 makeoptions	KERNLOADADDR=0x80050000
 options		HZ=1000
-#options		HWPMC_HOOKS
+options		HWPMC_HOOKS
+device		hwpmc
 
 # The PB92 has 32mb of RAM; hard-code that
 options		AR71XX_REALMEM=32*1024*1024
@@ -18,8 +19,8 @@ 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 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
+device		firmware		# Used by the above
 
 device		etherswitch
 device		arswitch
@@ -46,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
@@ -54,7 +61,7 @@ options         FFS                     #Berkeley Fast
 # Support uncompress lzma rootfs
 device		geom_uncompress
 options		GEOM_UNCOMPRESS
-options		ROOTDEVNAME=\"ufs:/dev/map/rootfs\"
+options		ROOTDEVNAME=\"ufs:/dev/map/rootfs.uncompress\"
 
 # PCI bus
 device		pci
@@ -63,11 +70,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
@@ -75,9 +83,9 @@ device		nvram2env
 #options 	BOOTP_COMPAT		# Workaround for broken bootp daemons.
 #options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 
-#options 	GEOM_LABEL		# Provides labelization
+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
@@ -125,22 +133,26 @@ 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		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
@@ -159,20 +171,29 @@ 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 	_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