Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -31,6 +31,12 @@
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20190620:
+	The "device random" option has been removed.  Entropy collection and
+	the /dev/random device are no longer an optional component.
+	Implementations of distilling algorithms can still be made loadable
+	with "options RANDOM_LOADABLE" (e.g., random_fortuna.ko).
+
 20190612:
 	Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
 	been upgraded to 8.0.1.  Please see the 20141231 entry below for
Index: head/release/picobsd/bridge/PICOBSD
===================================================================
--- head/release/picobsd/bridge/PICOBSD
+++ head/release/picobsd/bridge/PICOBSD
@@ -50,7 +50,6 @@
 # qemu, so we set HZ explicitly.
 options		HZ=1000
 
-device		random			# used by ssh
 device		pci
 
 # Floppy drives
Index: head/release/picobsd/qemu/PICOBSD
===================================================================
--- head/release/picobsd/qemu/PICOBSD
+++ head/release/picobsd/qemu/PICOBSD
@@ -56,7 +56,6 @@
 # qemu, so we set HZ explicitly.
 options		HZ=1000
 
-device		random			# used by ssh
 device		pci
 
 # Floppy drives
Index: head/share/man/man4/random.4
===================================================================
--- head/share/man/man4/random.4
+++ head/share/man/man4/random.4
@@ -30,7 +30,6 @@
 .Nm random
 .Nd the entropy device
 .Sh SYNOPSIS
-.Cd "device random"
 .Cd "options RANDOM_LOADABLE"
 .Cd "options RANDOM_ENABLE_ETHER"
 .Cd "options RANDOM_ENABLE_UMA"
Index: head/sys/amd64/conf/GENERIC
===================================================================
--- head/sys/amd64/conf/GENERIC
+++ head/sys/amd64/conf/GENERIC
@@ -309,7 +309,6 @@
 # Pseudo devices.
 device		crypto			# core crypto support
 device		loop			# Network loopback
-device		random			# Entropy device
 device		padlock_rng		# VIA Padlock RNG
 device		rdrand_rng		# Intel Bull Mountain RNG
 device		ether			# Ethernet support
Index: head/sys/amd64/conf/MINIMAL
===================================================================
--- head/sys/amd64/conf/MINIMAL
+++ head/sys/amd64/conf/MINIMAL
@@ -10,7 +10,7 @@
 #   some features (ACL, GJOURNAL) that GENERIC includes.
 # o acpi as a module has been reported flakey and not well tested, so
 #   is included in the kernel.
-# o random is included due to uncertaty...
+# o (non-loaded) random is included due to uncertainty...
 # o Many networking things are included
 #
 # For now, please run changes to these list past imp@freebsd.org
@@ -131,7 +131,6 @@
 
 # Pseudo devices.
 device		loop			# Network loopback
-device		random			# Entropy device
 device		padlock_rng		# VIA Padlock RNG
 device		rdrand_rng		# Intel Bull Mountain RNG
 device		ether			# Ethernet support
Index: head/sys/arm/conf/ALPINE
===================================================================
--- head/sys/arm/conf/ALPINE
+++ head/sys/arm/conf/ALPINE
@@ -41,7 +41,6 @@
 
 # Pseudo devices
 device		loop
-device		random
 device		pty
 device		md
 device		gpio
Index: head/sys/arm/conf/ARMADA38X
===================================================================
--- head/sys/arm/conf/ARMADA38X
+++ head/sys/arm/conf/ARMADA38X
@@ -25,7 +25,6 @@
 options		VM_KMEM_SIZE_MAX=0x9CCD000
 
 # Pseudo devices
-device		random
 device		pty
 device		loop
 device		md
Index: head/sys/arm/conf/ARMADAXP
===================================================================
--- head/sys/arm/conf/ARMADAXP
+++ head/sys/arm/conf/ARMADAXP
@@ -46,7 +46,6 @@
 options 	NO_SWAPPING
 
 # Pseudo devices
-device		random
 device		pty
 device		loop
 device		md
Index: head/sys/arm/conf/DB-78XXX
===================================================================
--- head/sys/arm/conf/DB-78XXX
+++ head/sys/arm/conf/DB-78XXX
@@ -45,7 +45,6 @@
 # Pseudo devices
 device		loop
 device		md
-device		random
 
 # Serial ports
 device		uart
Index: head/sys/arm/conf/DB-88F5XXX
===================================================================
--- head/sys/arm/conf/DB-88F5XXX
+++ head/sys/arm/conf/DB-88F5XXX
@@ -44,7 +44,6 @@
 # Pseudo devices
 device		md
 device		loop
-device		random
 
 # Serial ports
 device		uart
Index: head/sys/arm/conf/DB-88F6XXX
===================================================================
--- head/sys/arm/conf/DB-88F6XXX
+++ head/sys/arm/conf/DB-88F6XXX
@@ -46,7 +46,6 @@
 # Pseudo devices
 device		loop
 device		md
-device		random
 
 # Serial ports
 device		uart
Index: head/sys/arm/conf/DOCKSTAR
===================================================================
--- head/sys/arm/conf/DOCKSTAR
+++ head/sys/arm/conf/DOCKSTAR
@@ -68,7 +68,6 @@
 device		loop			# Network loopback
 device		md			# Memory/malloc disk
 device		pty			# BSD-style compatibility pseudo ttys
-device		random			# Entropy device
 device		tuntap			# Packet tunnel.
 device		ether			# Required for all ethernet devices
 device		vlan			# 802.1Q VLAN support
Index: head/sys/arm/conf/DREAMPLUG-1001
===================================================================
--- head/sys/arm/conf/DREAMPLUG-1001
+++ head/sys/arm/conf/DREAMPLUG-1001
@@ -71,7 +71,6 @@
 device		loop			# Network loopback
 device		md			# Memory/malloc disk
 device		pty			# BSD-style compatibility pseudo ttys
-device		random			# Entropy device
 device		tuntap			# Packet tunnel.
 device		ether			# Required for all ethernet devices
 device		vlan			# 802.1Q VLAN support
Index: head/sys/arm/conf/EFIKA_MX
===================================================================
--- head/sys/arm/conf/EFIKA_MX
+++ head/sys/arm/conf/EFIKA_MX
@@ -57,7 +57,6 @@
 
 # Pseudo devices.
 device		loop			# Network loopback
-device		random			# Entropy device
 device		ether			# Ethernet support
 #device		vlan			# 802.1Q VLAN support
 #device		tuntap			# Packet tunnel.
Index: head/sys/arm/conf/GENERIC
===================================================================
--- head/sys/arm/conf/GENERIC
+++ head/sys/arm/conf/GENERIC
@@ -121,7 +121,6 @@
 device		pty
 device		snp
 device		md			# Memory "disks"
-device		random			# Entropy device
 device		firmware		# firmware assist module
 device		pl310			# PL310 L2 cache controller
 device		psci
Index: head/sys/arm/conf/IMX53
===================================================================
--- head/sys/arm/conf/IMX53
+++ head/sys/arm/conf/IMX53
@@ -44,7 +44,6 @@
 
 # Pseudo devices.
 device		loop			# Network loopback
-device		random			# Entropy device
 device		ether			# Ethernet support
 #device		vlan			# 802.1Q VLAN support
 #device		tuntap			# Packet tunnel.
Index: head/sys/arm/conf/IMX6
===================================================================
--- head/sys/arm/conf/IMX6
+++ head/sys/arm/conf/IMX6
@@ -49,7 +49,6 @@
 
 # Pseudo devices.
 device		loop			# Network loopback
-device		random			# Entropy device
 device		vlan			# 802.1Q VLAN support
 device		tuntap			# Packet tunnel.
 device		md			# Memory "disks"
Index: head/sys/arm/conf/RPI-B
===================================================================
--- head/sys/arm/conf/RPI-B
+++ head/sys/arm/conf/RPI-B
@@ -65,7 +65,6 @@
 device		bcm2835_bsc
 
 device		md
-device		random			# Entropy device
 
 # USB support
 device		usb
Index: head/sys/arm/conf/RT1310
===================================================================
--- head/sys/arm/conf/RT1310
+++ head/sys/arm/conf/RT1310
@@ -51,7 +51,6 @@
 device		loop
 device		md
 device		pty
-device		random
 
 # Serial ports
 device		uart
Index: head/sys/arm/conf/SHEEVAPLUG
===================================================================
--- head/sys/arm/conf/SHEEVAPLUG
+++ head/sys/arm/conf/SHEEVAPLUG
@@ -46,7 +46,6 @@
 
 # Pseudo devices
 device		loop
-device		random
 
 # Serial ports
 device		uart
Index: head/sys/arm/conf/SOCFPGA
===================================================================
--- head/sys/arm/conf/SOCFPGA
+++ head/sys/arm/conf/SOCFPGA
@@ -58,7 +58,6 @@
 # Pseudo devices
 
 device		loop
-device		random
 device		pty
 device		md
 device		gpio
Index: head/sys/arm/conf/TEGRA124
===================================================================
--- head/sys/arm/conf/TEGRA124
+++ head/sys/arm/conf/TEGRA124
@@ -43,7 +43,6 @@
 
 # Pseudo devices.
 device		loop			# Network loopback
-device		random			# Entropy device
 device		vlan			# 802.1Q VLAN support
 #device		tuntap			# Packet tunnel.
 device		md			# Memory "disks"
Index: head/sys/arm/conf/TS7800
===================================================================
--- head/sys/arm/conf/TS7800
+++ head/sys/arm/conf/TS7800
@@ -45,7 +45,6 @@
 # Pseudo devices
 device		md
 device		loop
-device		random
 
 # Serial ports
 device		uart
Index: head/sys/arm/conf/VERSATILEPB
===================================================================
--- head/sys/arm/conf/VERSATILEPB
+++ head/sys/arm/conf/VERSATILEPB
@@ -66,7 +66,6 @@
 makeoptions	SC_DFLT_FONT=cp437
 
 device		md
-device		random			# Entropy device
 
 options 	PLATFORM
 
Index: head/sys/arm/conf/VYBRID
===================================================================
--- head/sys/arm/conf/VYBRID
+++ head/sys/arm/conf/VYBRID
@@ -59,7 +59,6 @@
 # Pseudo devices
 
 device		loop
-device		random
 device		pty
 device		md
 device		gpio
Index: head/sys/arm/conf/ZEDBOARD
===================================================================
--- head/sys/arm/conf/ZEDBOARD
+++ head/sys/arm/conf/ZEDBOARD
@@ -48,7 +48,6 @@
 device		mpcore_timer
 
 device		loop
-device		random
 device		ether
 device		cgem			# Zynq-7000 gig ethernet device
 device		mii
Index: head/sys/arm64/conf/GENERIC
===================================================================
--- head/sys/arm64/conf/GENERIC
+++ head/sys/arm64/conf/GENERIC
@@ -293,7 +293,6 @@
 # Pseudo devices.
 device		crypto		# core crypto support
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tuntap		# Packet tunnel.
Index: head/sys/conf/NOTES
===================================================================
--- head/sys/conf/NOTES
+++ head/sys/conf/NOTES
@@ -1170,9 +1170,6 @@
 #
 options 	EXT2FS
 
-# Cryptographically secure random number generator; /dev/random
-device		random
-
 # The system memory devices; /dev/mem, /dev/kmem
 device		mem
 
Index: head/sys/conf/files
===================================================================
--- head/sys/conf/files
+++ head/sys/conf/files
@@ -686,14 +686,14 @@
 crypto/des/des_setkey.c		optional crypto | ipsec | ipsec_support | netsmb
 crypto/rc4/rc4.c		optional netgraph_mppc_encryption | kgssapi
 crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \
-	ipsec | ipsec_support | random !random_loadable | wlan_ccmp
-crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | random !random_loadable
+	ipsec | ipsec_support | !random_loadable | wlan_ccmp
+crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | !random_loadable
 crypto/rijndael/rijndael-api.c	optional crypto | ipsec | ipsec_support | \
 	wlan_ccmp
 crypto/sha1.c			optional carp | crypto | ether | ipsec | \
 	ipsec_support | netgraph_mppc_encryption | sctp
 crypto/sha2/sha256c.c		optional crypto | ekcd | geom_bde | ipsec | \
-	ipsec_support | random !random_loadable | sctp | zfs
+	ipsec_support | !random_loadable | sctp | zfs
 crypto/sha2/sha512c.c		optional crypto | geom_bde | ipsec | \
 	ipsec_support | zfs
 crypto/skein/skein.c		optional crypto | zfs
@@ -2766,11 +2766,11 @@
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2860.fw"
-dev/random/random_infra.c	optional random
-dev/random/random_harvestq.c	optional random
-dev/random/randomdev.c		optional random !random_loadable
-dev/random/fortuna.c		optional random !random_loadable
-dev/random/hash.c		optional random !random_loadable
+dev/random/random_infra.c	standard
+dev/random/random_harvestq.c	standard
+dev/random/randomdev.c		optional !random_loadable
+dev/random/fortuna.c		optional !random_loadable
+dev/random/hash.c		optional !random_loadable
 dev/rc/rc.c			optional rc
 dev/rccgpio/rccgpio.c		optional rccgpio gpio
 dev/re/if_re.c			optional re
Index: head/sys/conf/files.arm64
===================================================================
--- head/sys/conf/files.arm64
+++ head/sys/conf/files.arm64
@@ -87,7 +87,7 @@
 arm/broadcom/bcm2835/bcm2835_gpio.c		optional gpio soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_intr.c		optional soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_mbox.c		optional soc_brcm_bcm2837 fdt
-arm/broadcom/bcm2835/bcm2835_rng.c		optional random !random_loadable soc_brcm_bcm2837 fdt
+arm/broadcom/bcm2835/bcm2835_rng.c		optional !random_loadable soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_sdhci.c		optional sdhci soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_sdhost.c		optional sdhci soc_brcm_bcm2837 fdt
 arm/broadcom/bcm2835/bcm2835_spi.c		optional bcm2835_spi soc_brcm_bcm2837 fdt
Index: head/sys/conf/files.powerpc
===================================================================
--- head/sys/conf/files.powerpc
+++ head/sys/conf/files.powerpc
@@ -62,7 +62,7 @@
 dev/ofw/ofw_subr.c		standard
 dev/powermac_nvram/powermac_nvram.c optional	powermac_nvram powermac
 dev/quicc/quicc_bfe_fdt.c	optional	quicc mpc85xx
-dev/random/darn.c		optional	powerpc64 random !random_loadable
+dev/random/darn.c		optional	powerpc64 !random_loadable
 dev/scc/scc_bfe_macio.c		optional	scc powermac
 dev/sdhci/fsl_sdhci.c		optional	mpc85xx sdhci
 dev/sec/sec.c			optional	sec mpc85xx
Index: head/sys/conf/options
===================================================================
--- head/sys/conf/options
+++ head/sys/conf/options
@@ -734,7 +734,6 @@
 DEV_PF			opt_pf.h
 DEV_PFLOG		opt_pf.h
 DEV_PFSYNC		opt_pf.h
-DEV_RANDOM		opt_global.h
 DEV_SPLASH		opt_splash.h
 DEV_VLAN		opt_vlan.h
 
Index: head/sys/i386/conf/GENERIC
===================================================================
--- head/sys/i386/conf/GENERIC
+++ head/sys/i386/conf/GENERIC
@@ -292,7 +292,6 @@
 # Pseudo devices.
 device		crypto			# core crypto support
 device		loop			# Network loopback
-device		random			# Entropy device
 device		padlock_rng		# VIA Padlock RNG
 device		rdrand_rng		# Intel Bull Mountain RNG
 device		ether			# Ethernet support
Index: head/sys/i386/conf/MINIMAL
===================================================================
--- head/sys/i386/conf/MINIMAL
+++ head/sys/i386/conf/MINIMAL
@@ -10,7 +10,7 @@
 #   some features (ACL, GJOURNAL) that GENERIC includes.
 # o acpi as a module has been reported flakey and not well tested, so
 #   is included in the kernel.
-# o random is included due to uncertaty...
+# o (non-loaded) random is included due to uncertainty...
 # o Many networking things are included
 #
 # For now, please run changes to these list past imp@freebsd.org
@@ -132,7 +132,6 @@
 
 # Pseudo devices.
 device		loop			# Network loopback
-device		random			# Entropy device
 device		padlock_rng		# VIA Padlock RNG
 device		rdrand_rng		# Intel Bull Mountain RNG
 device		ether			# Ethernet support
Index: head/sys/mips/conf/BCM
===================================================================
--- head/sys/mips/conf/BCM
+++ head/sys/mips/conf/BCM
@@ -82,7 +82,6 @@
 #Base
 device		loop
 device		ether
-device 		random
 device		md
 
 #Performance
Index: head/sys/mips/conf/DIR-825B1
===================================================================
--- head/sys/mips/conf/DIR-825B1
+++ head/sys/mips/conf/DIR-825B1
@@ -21,7 +21,6 @@
 
 # Since the kernel image must fit inside 1024KiB, we have to build almost
 # everything as modules.
-# nodevice random
 nodevice gpio
 nodevice gpioled
 nodevice gif
Index: head/sys/mips/conf/ERL
===================================================================
--- head/sys/mips/conf/ERL
+++ head/sys/mips/conf/ERL
@@ -149,7 +149,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tuntap		# Packet tunnel.
Index: head/sys/mips/conf/JZ4780
===================================================================
--- head/sys/mips/conf/JZ4780
+++ head/sys/mips/conf/JZ4780
@@ -68,7 +68,6 @@
 device		bpf
 device		md
 device		uart
-device		random
 
 device		fdt_pinctrl
 
Index: head/sys/mips/conf/OCTEON1
===================================================================
--- head/sys/mips/conf/OCTEON1
+++ head/sys/mips/conf/OCTEON1
@@ -184,7 +184,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tuntap		# Packet tunnel.
Index: head/sys/mips/conf/PB92
===================================================================
--- head/sys/mips/conf/PB92
+++ head/sys/mips/conf/PB92
@@ -133,5 +133,4 @@
 device		ether
 #device		md
 #device		bpf
-device		random
 #device		if_bridge
Index: head/sys/mips/conf/PICOSTATION_M2HP
===================================================================
--- head/sys/mips/conf/PICOSTATION_M2HP
+++ head/sys/mips/conf/PICOSTATION_M2HP
@@ -68,6 +68,3 @@
 # Enable GPIO
 device         gpio
 device         gpioled
-
-# RNG
-device        random
Index: head/sys/mips/conf/WZR-300HP
===================================================================
--- head/sys/mips/conf/WZR-300HP
+++ head/sys/mips/conf/WZR-300HP
@@ -49,4 +49,4 @@
 # load these via modules, shrink kernel
 nodevice	if_bridge
 nodevice	bridgestp
-nodevice	random
+options		RANDOM_LOADABLE
Index: head/sys/mips/conf/WZR-HPAG300H
===================================================================
--- head/sys/mips/conf/WZR-HPAG300H
+++ head/sys/mips/conf/WZR-HPAG300H
@@ -49,4 +49,4 @@
 # load these via modules, shrink kernel
 nodevice	if_bridge
 nodevice	bridgestp
-nodevice	random
+options		RANDOM_LOADABLE
Index: head/sys/mips/conf/X1000
===================================================================
--- head/sys/mips/conf/X1000
+++ head/sys/mips/conf/X1000
@@ -63,7 +63,6 @@
 device		bpf
 device		md
 device		uart
-device		random
 
 device		fdt_pinctrl
 
Index: head/sys/mips/conf/std.AR5312
===================================================================
--- head/sys/mips/conf/std.AR5312
+++ head/sys/mips/conf/std.AR5312
@@ -72,7 +72,6 @@
 device		ether
 device		md
 device		bpf
-device		random
 
 options 	ARGE_DEBUG	# Enable if_arge debugging for now
 
Index: head/sys/mips/conf/std.AR5315
===================================================================
--- head/sys/mips/conf/std.AR5315
+++ head/sys/mips/conf/std.AR5315
@@ -72,7 +72,6 @@
 device		ether
 device		md
 device		bpf
-device		random
 
 options 	ARGE_DEBUG	# Enable if_arge debugging for now
 
Index: head/sys/mips/conf/std.AR_MIPS_BASE
===================================================================
--- head/sys/mips/conf/std.AR_MIPS_BASE
+++ head/sys/mips/conf/std.AR_MIPS_BASE
@@ -25,9 +25,6 @@
 makeoptions 	MODULES_OVERRIDE+="if_bridge bridgestp usb"
 makeoptions 	MODULES_OVERRIDE+="alq"
 
-# Random - required during early boot!
-device 		random
-
 # net80211
 options 	IEEE80211_DEBUG
 options 	IEEE80211_SUPPORT_MESH
Index: head/sys/mips/conf/std.BERI
===================================================================
--- head/sys/mips/conf/std.BERI
+++ head/sys/mips/conf/std.BERI
@@ -61,5 +61,4 @@
 device		geom_map
 device		loop
 device		md
-device		random
 device		snp
Index: head/sys/mips/conf/std.MALTA
===================================================================
--- head/sys/mips/conf/std.MALTA
+++ head/sys/mips/conf/std.MALTA
@@ -55,4 +55,3 @@
 device		bpf
 device		md
 device		uart
-device		random
Index: head/sys/mips/conf/std.XLP
===================================================================
--- head/sys/mips/conf/std.XLP
+++ head/sys/mips/conf/std.XLP
@@ -66,7 +66,6 @@
 
 # Pseudo
 device		loop
-device		random
 device		md
 device		bpf
 
Index: head/sys/mips/mediatek/std.mediatek
===================================================================
--- head/sys/mips/mediatek/std.mediatek
+++ head/sys/mips/mediatek/std.mediatek
@@ -74,9 +74,6 @@
 # UART support
 device 		uart
 
-# random support
-device 		random
-
 # loop device support
 device 		loop
 
Index: head/sys/mips/mediatek/std.rt2880
===================================================================
--- head/sys/mips/mediatek/std.rt2880
+++ head/sys/mips/mediatek/std.rt2880
@@ -73,9 +73,6 @@
 # UART support
 device 		uart
 
-# random support
-device 		random
-
 # loop device support
 device 		loop
 
Index: head/sys/powerpc/conf/GENERIC
===================================================================
--- head/sys/powerpc/conf/GENERIC
+++ head/sys/powerpc/conf/GENERIC
@@ -162,7 +162,6 @@
 # Pseudo devices.
 device		crypto		# core crypto support
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tuntap		# Packet tunnel.
Index: head/sys/powerpc/conf/GENERIC64
===================================================================
--- head/sys/powerpc/conf/GENERIC64
+++ head/sys/powerpc/conf/GENERIC64
@@ -183,7 +183,6 @@
 # Pseudo devices.
 device		crypto		# core crypto support
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tuntap		# Packet tunnel.
Index: head/sys/powerpc/conf/MPC85XX
===================================================================
--- head/sys/powerpc/conf/MPC85XX
+++ head/sys/powerpc/conf/MPC85XX
@@ -93,7 +93,6 @@
 device		pass
 device		pci
 device		quicc
-device		random
 #device		rl
 device		scbus
 device		scc
Index: head/sys/powerpc/conf/MPC85XXSPE
===================================================================
--- head/sys/powerpc/conf/MPC85XXSPE
+++ head/sys/powerpc/conf/MPC85XXSPE
@@ -94,7 +94,6 @@
 device		pass
 device		pci
 device		quicc
-device		random
 #device		rl
 device		scbus
 device		scc
Index: head/sys/powerpc/conf/QORIQ64
===================================================================
--- head/sys/powerpc/conf/QORIQ64
+++ head/sys/powerpc/conf/QORIQ64
@@ -99,7 +99,6 @@
 device  	mmcsd
 device		pass
 device		pci
-device		random
 #device		rl
 device		scbus
 device		scc
Index: head/sys/powerpc/conf/dpaa/DPAA
===================================================================
--- head/sys/powerpc/conf/dpaa/DPAA
+++ head/sys/powerpc/conf/dpaa/DPAA
@@ -96,7 +96,6 @@
 # Pseudo devices
 device		ether		# Ethernet support
 device		loop		# Network loopback
-device		random		# Entropy device
 device		bpf		# Berkeley packet filter
 device		md		# Memory "disks"
 
Index: head/sys/riscv/conf/GENERIC
===================================================================
--- head/sys/riscv/conf/GENERIC
+++ head/sys/riscv/conf/GENERIC
@@ -137,7 +137,6 @@
 # Pseudo devices.
 device		crypto		# core crypto support
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tuntap		# Packet tunnel.
Index: head/sys/sparc64/conf/GENERIC
===================================================================
--- head/sys/sparc64/conf/GENERIC
+++ head/sys/sparc64/conf/GENERIC
@@ -224,7 +224,6 @@
 # Pseudo devices.
 device		crypto		# core crypto support
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		vlan		# 802.1Q VLAN support
 device		tuntap		# Packet tunnel.
Index: head/sys/sys/random.h
===================================================================
--- head/sys/sys/random.h
+++ head/sys/sys/random.h
@@ -37,26 +37,9 @@
 
 struct uio;
 
-#if defined(DEV_RANDOM)
 void read_random(void *, u_int);
 int read_random_uio(struct uio *, bool);
 bool is_random_seeded(void);
-#else
-static __inline int
-read_random_uio(void *a __unused, u_int b __unused)
-{
-	return (0);
-}
-static __inline void
-read_random(void *a __unused, u_int b __unused)
-{
-}
-static __inline bool
-is_random_seeded(void)
-{
-	return (false);
-}
-#endif
 
 /*
  * Note: if you add or remove members of random_entropy_source, remember to
@@ -101,7 +84,6 @@
 #define RANDOM_LEGACY_BOOT_ENTROPY_MODULE	"/boot/entropy"
 #define RANDOM_CACHED_BOOT_ENTROPY_MODULE	"boot_entropy_cache"
 
-#if defined(DEV_RANDOM)
 extern u_int hc_source_mask;
 void random_harvest_queue_(const void *, u_int, enum random_entropy_source);
 void random_harvest_fast_(const void *, u_int);
@@ -133,13 +115,6 @@
 
 void random_harvest_register_source(enum random_entropy_source);
 void random_harvest_deregister_source(enum random_entropy_source);
-#else
-#define random_harvest_queue(a, b, c) do {} while (0)
-#define random_harvest_fast(a, b, c) do {} while (0)
-#define random_harvest_direct(a, b, c) do {} while (0)
-#define random_harvest_register_source(a) do {} while (0)
-#define random_harvest_deregister_source(a) do {} while (0)
-#endif
 
 #if defined(RANDOM_ENABLE_UMA)
 #define random_harvest_fast_uma(a, b, c)	random_harvest_fast(a, b, c)
Index: head/tools/tools/nanobsd/pcengines/ALIX_DSK
===================================================================
--- head/tools/tools/nanobsd/pcengines/ALIX_DSK
+++ head/tools/tools/nanobsd/pcengines/ALIX_DSK
@@ -65,7 +65,6 @@
 device		ath_rate_sample	
 device		wi		
 device		loop		
-device		random		
 device		ether		
 device		tun		
 device		pty		
Index: head/tools/tools/tinybsd/conf/bridge/TINYBSD
===================================================================
--- head/tools/tools/tinybsd/conf/bridge/TINYBSD
+++ head/tools/tools/tinybsd/conf/bridge/TINYBSD
@@ -130,7 +130,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
Index: head/tools/tools/tinybsd/conf/default/TINYBSD
===================================================================
--- head/tools/tools/tinybsd/conf/default/TINYBSD
+++ head/tools/tools/tinybsd/conf/default/TINYBSD
@@ -140,7 +140,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
Index: head/tools/tools/tinybsd/conf/firewall/TINYBSD
===================================================================
--- head/tools/tools/tinybsd/conf/firewall/TINYBSD
+++ head/tools/tools/tinybsd/conf/firewall/TINYBSD
@@ -129,7 +129,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		pty		# Pseudo-ttys (telnet etc)
 device          md              # Memory "disks"
Index: head/tools/tools/tinybsd/conf/minimal/TINYBSD
===================================================================
--- head/tools/tools/tinybsd/conf/minimal/TINYBSD
+++ head/tools/tools/tinybsd/conf/minimal/TINYBSD
@@ -65,7 +65,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
Index: head/tools/tools/tinybsd/conf/vpn/TINYBSD
===================================================================
--- head/tools/tools/tinybsd/conf/vpn/TINYBSD
+++ head/tools/tools/tinybsd/conf/vpn/TINYBSD
@@ -130,7 +130,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
Index: head/tools/tools/tinybsd/conf/wireless/TINYBSD
===================================================================
--- head/tools/tools/tinybsd/conf/wireless/TINYBSD
+++ head/tools/tools/tinybsd/conf/wireless/TINYBSD
@@ -136,7 +136,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
Index: head/tools/tools/tinybsd/conf/wrap/TINYBSD
===================================================================
--- head/tools/tools/tinybsd/conf/wrap/TINYBSD
+++ head/tools/tools/tinybsd/conf/wrap/TINYBSD
@@ -102,7 +102,6 @@
 
 # Pseudo devices.
 device		loop		# Network loopback
-device		random		# Entropy device
 device		ether		# Ethernet support
 device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.