--- elwix/config/ELWIX_ALFA_N2	2014/01/23 22:26:00	1.1.2.13
+++ 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
@@ -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
@@ -126,22 +133,25 @@ 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
@@ -161,17 +171,26 @@ 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
+
+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