[Midnightbsd-cvs] src [6821] trunk/sys: turn off firewire and turn on hw random number generators

[laffer1 at midnightbsd.org]

Revision: 6821
          http://svnweb.midnightbsd.org/src/?rev=6821
Author:   laffer1
Date:     2014-10-02 23:58:37 -0400 (Thu, 02 Oct 2014)
Log Message:
-----------
turn off firewire and turn on hw random number generators

Modified Paths:
--------------
    trunk/sys/amd64/conf/GENERIC
    trunk/sys/i386/conf/GENERIC

Modified: trunk/sys/amd64/conf/GENERIC
===================================================================
--- trunk/sys/amd64/conf/GENERIC	2014-10-03 03:58:09 UTC (rev 6820)
+++ trunk/sys/amd64/conf/GENERIC	2014-10-03 03:58:37 UTC (rev 6821)
@@ -265,6 +265,8 @@
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
+options 	PADLOCK_RNG	# VIA Padlock RNG
+options 	RDRAND_RNG	# Intel Bull Mountain RNG
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tun		# Packet tunnel.
@@ -320,15 +322,6 @@
 device		urtw		# Realtek RTL8187B/L wireless NICs
 device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
-# FireWire support
-device		firewire	# FireWire bus code
-# sbp(4) works for some systems but causes boot failure on others
-#device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-device		fwip		# IP over FireWire (RFC 2734,3146)
-device		dcons		# Dumb console driver
-device		dcons_crom	# Configuration ROM for dcons
-
 # Sound support
 device		sound		# Generic sound driver (required)
 device		snd_cmi		# CMedia CMI8338/CMI8738

Modified: trunk/sys/i386/conf/GENERIC
===================================================================
--- trunk/sys/i386/conf/GENERIC	2014-10-03 03:58:09 UTC (rev 6820)
+++ trunk/sys/i386/conf/GENERIC	2014-10-03 03:58:37 UTC (rev 6821)
@@ -280,6 +280,8 @@
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
+options 	PADLOCK_RNG	# VIA Padlock RNG
+options 	RDRAND_RNG	# Intel Bull Mountain RNG
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tun		# Packet tunnel.
@@ -335,15 +337,6 @@
 device		urtw		# Realtek RTL8187B/L wireless NICs
 device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
-# FireWire support
-device		firewire	# FireWire bus code
-# sbp(4) works for some systems but causes boot failure on others
-#device		sbp		# SCSI over FireWire (Requires scbus and da)
-device		fwe		# Ethernet over FireWire (non-standard!)
-device		fwip		# IP over FireWire (RFC 2734,3146)
-device		dcons		# Dumb console driver
-device		dcons_crom	# Configuration ROM for dcons
-
 # Sound support
 device		sound		# Generic sound driver (required)
 device		snd_cmi		# CMedia CMI8338/CMI8738