--- elwix/config/ELWIX_i386	2013/07/17 15:01:44	1.1.2.1
+++ elwix/config/ELWIX_i386	2013/07/22 21:56:20	1.1.2.8
@@ -1,10 +1,10 @@
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.583 2013/01/14 00:28:54 svnexp Exp $
-# $Id: ELWIX_i386,v 1.1.2.1 2013/07/17 15:01:44 misho Exp $
+# $Id: ELWIX_i386,v 1.1.2.8 2013/07/22 21:56:20 misho Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
-ident		ELWIX
+ident		ELWIX_i386
 
 hints		"ELWIX_i386.hints"	# Default places to look for devices.
 
@@ -30,7 +30,7 @@ options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options 	NFSCLIENT		#Network File System client
 options 	NFSSERVER		#Network File System server
-options		MD_ROOT_SIZE=8000
+options		MD_ROOT_SIZE=9000
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
@@ -42,12 +42,10 @@ options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_GATE
 options 	GEOM_UZIP
-options 	GEOM_REDBOOT
 device		geom_redboot
 device		geom_map	# to get access to the SPI flash partitions
 device		geom_uncompress	# compressed in-memory filesystem hackery!
 device		geom_uzip	# compressed in-memory filesystem support
-options 	GEOM_MAP
 options		GEOM_UNCOMPRESS
 options         GEOM_ELI
 options         GEOM_MIRROR
@@ -115,7 +113,6 @@ device		fdc
 # ATA controllers
 device		ahci		# AHCI-compatible SATA controllers
 device		ata		# Legacy ATA/SATA controllers
-options 	ATA_CAM		# Handle legacy controllers with CAM
 options 	ATA_STATIC_ID	# Static device numbering
 device		mvs		# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
 device		siis		# SiliconImage SiI3124/SiI3132/SiI3531 SATA
@@ -166,6 +163,7 @@ device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RA
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
+device		hptnr		# Highpoint DC7280, R750
 device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
 device		hpt27xx		# Highpoint RocketRAID 27xx
 device		iir		# Intel Integrated RAID
@@ -177,6 +175,7 @@ device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID cont
 # RAID controllers
 device		aac		# Adaptec FSA RAID
 device		aacp		# SCSI passthrough for aac (requires CAM)
+device		aacraid		# Adaptec by PMC RAID
 device		ida		# Compaq Smart RAID
 device		mfi		# LSI MegaRAID SAS
 device		mlx		# Mylex DAC960 family
@@ -219,7 +218,6 @@ device		uart		# Generic UART driver
 device		ppc
 device		ppbus		# Parallel port bus (required)
 device		lpt		# Printer
-device		plip		# TCP/IP over parallel
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 
@@ -300,6 +298,8 @@ device		wlan_acl
 device		wlan_xauth
 device		wlan_rssadapt
 #options	AH_RXCFG_SDMAMW_4BYTES
+#options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
+options		ALQ
 options		IEEE80211_ALQ
 options		IEEE80211_SUPPORT_TDMA
 options		IEEE80211_SUPPORT_SUPERG
@@ -430,7 +430,6 @@ device		virtio_balloon	# VirtIO Memory Balloon device
 ### ELWIX Additional custom settings ...
 
 device		if_bridge
-device		bridgestp
 device		tap
 device		gre
 device		lagg