Back out r253779 & r253786.

14 files changed, 6 insertions, 18 deletions

diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE
index a5d4bbf..69b10a2 100644
--- a/sys/mips/conf/AR71XX_BASE
+++ b/sys/mips/conf/AR71XX_BASE
@@ -24,7 +24,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 # Build these as modules so small platform builds will have the
 # modules already built.
-makeoptions	MODULES_OVERRIDE="random yarrow_rng gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci"
+makeoptions	MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci"
 
 options		DDB
 options		KDB
@@ -115,7 +115,6 @@ device		ether
 device		md
 device		bpf
 device		random
-options 	YARROW_RNG	# Yarrow software RNG
 device		if_bridge
 device		gif		# ip[46] in ip[46] tunneling protocol
 device		gre		# generic encapsulation - only for IPv4 in IPv4 though atm
diff --git a/sys/mips/conf/AR724X_BASE b/sys/mips/conf/AR724X_BASE
index f74a693..7ffadb1 100644
--- a/sys/mips/conf/AR724X_BASE
+++ b/sys/mips/conf/AR724X_BASE
@@ -25,7 +25,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
 # Build these as modules so small platform builds will have the
 # modules already built.
-makeoptions	MODULES_OVERRIDE="random yarrow_rng gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci hwpmc cam"
+makeoptions	MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_pci hwpmc cam"
 
 options		DDB
 options		KDB
diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE
index ad81bee..a84474d 100644
--- a/sys/mips/conf/AR91XX_BASE
+++ b/sys/mips/conf/AR91XX_BASE
@@ -20,7 +20,7 @@ files		"../atheros/files.ar71xx"
 hints		"AR91XX_BASE.hints"
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-makeoptions	MODULES_OVERRIDE="random yarrow_rng gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
+makeoptions	MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
 
 options		DDB
 options		KDB
@@ -113,7 +113,6 @@ device		ether
 device		md
 device		bpf
 device		random
-options 	YARROW_RNG	# Yarrow software RNG
 device		if_bridge
 device		gpio
 device		gpioled
diff --git a/sys/mips/conf/AR933X_BASE b/sys/mips/conf/AR933X_BASE
index 8de1a47..282f3b3 100644
--- a/sys/mips/conf/AR933X_BASE
+++ b/sys/mips/conf/AR933X_BASE
@@ -20,7 +20,7 @@ files		"../atheros/files.ar71xx"
 hints		"AR933X_BASE.hints"
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-# makeoptions	MODULES_OVERRIDE="random yarrow_rng gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
+# makeoptions	MODULES_OVERRIDE="random gpio ar71xx if_gif if_gre if_bridge bridgestp usb wlan wlan_xauth wlan_acl wlan_wep wlan_tkip wlan_ccmp wlan_rssadapt wlan_amrr ath ath_ahb hwpmc"
 makeoptions	MODULES_OVERRIDE=""
 
 options		DDB
@@ -119,7 +119,6 @@ device		ether
 device		md
 device		bpf
 device		random
-options 	YARROW_RNG		# Yarrow software RNG
 device		if_bridge
 device		gpio
 device		gpioled
diff --git a/sys/mips/conf/BERI_TEMPLATE b/sys/mips/conf/BERI_TEMPLATE
index 46f61f1..f4d53ca 100644
--- a/sys/mips/conf/BERI_TEMPLATE
+++ b/sys/mips/conf/BERI_TEMPLATE
@@ -55,5 +55,4 @@ device		md
 device		ether
 device		loop
 device		random
-options 	YARROW_RNG		# Yarrow software RNG
 device		snp
diff --git a/sys/mips/conf/DIR-825 b/sys/mips/conf/DIR-825
index 352d91a..62189cfc 100644
--- a/sys/mips/conf/DIR-825
+++ b/sys/mips/conf/DIR-825
@@ -20,7 +20,6 @@ hints		"DIR-825.hints"
 # Since the kernel image must fit inside 1024KiB, we have to build almost
 # everything as modules.
 nodevice random
-nooptions YARROW_RNG
 nodevice gpio
 nodevice gpioled
 nodevice gif
diff --git a/sys/mips/conf/GXEMUL b/sys/mips/conf/GXEMUL
index 0d91d3ac..ea58622 100644
--- a/sys/mips/conf/GXEMUL
+++ b/sys/mips/conf/GXEMUL
@@ -51,7 +51,6 @@ device		gxemul_ether
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
-options 	YARROW_RNG	# Yarrow software RNG
 device		ether		# Ethernet support
 device		tun		# Packet tunnel.
 device		md		# Memory "disks"
diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
index 6227fa8..dfe5208 100644
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@@ -256,7 +256,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 # Pseudo devices.
 device		loop		# Network loopback
 device		random		# Entropy device
-options 	YARROW_RNG	# Yarrow software RNG
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tun		# Packet tunnel.
diff --git a/sys/mips/conf/PB92 b/sys/mips/conf/PB92
index f7d5e91..2ca7cfe 100644
--- a/sys/mips/conf/PB92
+++ b/sys/mips/conf/PB92
@@ -22,7 +22,7 @@ options		AR71XX_ENV_UBOOT
 # who already are using it without modifying the default flash layout)
 # we need to cut down on a lot of things.
 
-makeoptions	MODULES_OVERRIDE="ath ath_pci ath_ahb bridgestp if_bridge if_gif if_gre random yarrow_rng wlan wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt wlan_tkip wlan_wep wlan_xauth usb ar71xx"
+makeoptions	MODULES_OVERRIDE="ath ath_pci ath_ahb bridgestp if_bridge if_gif if_gre random wlan wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt wlan_tkip wlan_wep wlan_xauth usb ar71xx"
 
 hints		"PB92.hints"
 include		"../atheros/std.ar71xx"
diff --git a/sys/mips/conf/RT305X b/sys/mips/conf/RT305X
index 8471690..6527782 100644
--- a/sys/mips/conf/RT305X
+++ b/sys/mips/conf/RT305X
@@ -24,7 +24,7 @@ makeoptions	MIPS_LITTLE_ENDIAN=defined
 makeoptions	KERNLOADADDR=0x80001000
 
 # Don't build any modules yet.
-makeoptions	MODULES_OVERRIDE="wlan_xauth wlan_wep wlan_tkip wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt random yarrow_rng if_bridge bridgestp msdosfs md ipfw dummynet libalias geom/geom_label ufs usb/uplcom usb/u3g usb/umodem usb/umass usb/ucom cam zlib"
+makeoptions	MODULES_OVERRIDE="wlan_xauth wlan_wep wlan_tkip wlan_acl wlan_amrr wlan_ccmp wlan_rssadapt random if_bridge bridgestp msdosfs md ipfw dummynet libalias geom/geom_label ufs usb/uplcom usb/u3g usb/umodem usb/umass usb/ucom cam zlib"
 makeoptions	RT3052F
 
 include		"../rt305x/std.rt305x"
@@ -90,7 +90,6 @@ options         MROUTING                # Multicast routing
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
 
 device		random
-options 	YARROW_RNG		# Yarrow software RNG
 device		loop
 # RT3050F, RT3052F have only pseudo PHYs, so mii not required
 device		rt
diff --git a/sys/mips/conf/XLR64 b/sys/mips/conf/XLR64
index 486ce77..1db8d85 100644
--- a/sys/mips/conf/XLR64
+++ b/sys/mips/conf/XLR64
@@ -84,7 +84,6 @@ device 		uart
 # Pseudo
 device 		loop
 device 		random
-options 	YARROW_RNG	# Yarrow software RNG
 device 		md
 device		bpf
 
diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32
index 5ad65bd..d81eaf9 100644
--- a/sys/mips/conf/XLRN32
+++ b/sys/mips/conf/XLRN32
@@ -85,7 +85,6 @@ device 		uart
 # Pseudo
 device 		loop
 device 		random
-options 	YARROW_RNG	# Yarrow software RNG
 device 		md
 device		bpf
 
diff --git a/sys/mips/conf/std.SWARM b/sys/mips/conf/std.SWARM
index 5edd5a2..0405b0a 100644
--- a/sys/mips/conf/std.SWARM
+++ b/sys/mips/conf/std.SWARM
@@ -42,7 +42,6 @@ device		loop
 device		ether
 device		md
 device		random
-options 	YARROW_RNG		# Yarrow software RNG
 
 options		USB_DEBUG
 device usb
diff --git a/sys/mips/conf/std.XLP b/sys/mips/conf/std.XLP
index aa1042d..bf5fbe8 100644
--- a/sys/mips/conf/std.XLP
+++ b/sys/mips/conf/std.XLP
@@ -65,7 +65,6 @@ makeoptions	FDT_DTS_FILE=xlp-basic.dts
 # Pseudo
 device		loop
 device		random
-options 	YARROW_RNG		# Yarrow software RNG
 device		md
 device		bpf