MFC r330005-r330007, r330021, r330029, r330622, r331207: Solo loader.conf(5)

r330005:
Go back to one loader.conf

We really only need one loader.conf. The other loader.conf was created
because the current one took forever to parse in FORTH. That will be
fixed in the next commit.

r330006:
Take a meat cleaver to defaults/loader.conf

Remove almost all of the _load=XXX options (kept only those relevant
to splash screens, since there were other settings).
Remove the excessively cutesy comment blocks.
Remove excessive comments and replace with similar content
Remove gratuitous blank lines (while leaving some)

We have too many modules to list them all here. There's no purpose in
doing so and it's a giant hassle to maintain. In addition the extra
~500 lines slow this down on small platforms. It slowed it down
so much small platforms forked, which caused other issues...
This is a compromise between those two extremes.

r330007:
loader.conf is loader agnostic, so remove 4th references.

r330021:
These two directories build man pages, so it's incorrect to tag them
NO_OBJ. Also, make sure the loader.conf.5 man gets built and installed.

r330029:
Fix a typo: "now" -> "no".

r330622:
loader.conf(5): Document some other settings

These tend to have less coverage in other places and they don't have
defaults as of yet, so mention them here:
- fdt_overlays
- kernels_autodetect (lualoader only)

r331207:
loader.conf: remove obsolete non-x86 beastie menu statement

As of r330005 the same loader.conf defaults are used on all platforms.

8 files changed, 183 insertions, 625 deletions

diff --git a/stand/Makefile b/stand/Makefile
index 5234189..9ba6ea7 100644
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -9,6 +9,7 @@ SUBDIR+=		ficl
 SUBDIR+=		forth
 .endif
 
+SUBDIR+=		defaults
 SUBDIR+=		man
 
 .include <bsd.arch.inc.mk>
diff --git a/stand/arm/loader/loader.conf b/stand/arm/loader/loader.conf
deleted file mode 100644
index dd2a23a..0000000
--- a/stand/arm/loader/loader.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is defaults/loader.conf for ARM, containing defaults for loader(8).
-# Do not modify the contents of this file, instead put your customizations
-# into /boot/loader.conf or /boot/loader.conf.local
-# $FreeBSD$
-
-autoboot_delay=10
-bootfile="kernel"      # Kernel name (possibly absolute path)
-kernel="kernel"        # /boot sub-directory containing kernel and modules
-loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
-module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays"
-nextboot_conf="/boot/nextboot.conf"
-nextboot_enable="NO"
-verbose_loading="NO"
diff --git a/stand/defaults/Makefile b/stand/defaults/Makefile
new file mode 100644
index 0000000..131034d
--- /dev/null
+++ b/stand/defaults/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+FILES+=	loader.conf
+MAN+=	loader.conf.5
+
+FILESDIR_loader.conf=  /boot/defaults
+
+.include <bsd.prog.mk>
diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf
new file mode 100644
index 0000000..9e7ceaa
--- /dev/null
+++ b/stand/defaults/loader.conf
@@ -0,0 +1,153 @@
+# This is loader.conf - a file full of useful variables that you can
+# set to change the default load behavior of your system. You should
+# not edit this file!  Put any overrides into one of the
+# loader_conf_files instead and you will be able to update these
+# defaults later without spamming your local configuration information.
+#
+# All arguments must be in double quotes.
+#
+# $FreeBSD$
+
+###  Basic configuration options  ############################
+exec="echo Loading /boot/defaults/loader.conf"
+
+kernel="kernel"		# /boot sub-directory containing kernel and modules
+bootfile="kernel"	# Kernel name (possibly absolute path)
+kernel_options=""	# Flags to be passed to the kernel
+loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local"
+nextboot_conf="/boot/nextboot.conf"
+nextboot_enable="NO"
+verbose_loading="NO"		# Set to YES for verbose loader output
+
+###  Splash screen configuration  ############################
+splash_bmp_load="NO"		# Set this to YES for bmp splash screen!
+splash_pcx_load="NO"		# Set this to YES for pcx splash screen!
+splash_txt_load="NO"		# Set this to YES for TheDraw splash screen!
+vesa_load="NO"			# Set this to YES to load the vesa module
+bitmap_load="NO"		# Set this to YES if you want splash screen!
+bitmap_name="splash.bmp"	# Set this to the name of the file
+bitmap_type="splash_image_data" # and place it on the module_path
+
+###  Screen saver modules  ###################################
+# This is best done in rc.conf
+screensave_load="NO"		# Set to YES to load a screensaver module
+screensave_name="green_saver"	# Set to the name of the screensaver module
+
+###  Random number generator configuration  ##################
+# See rc.conf(5). The entropy_boot_file config variable must agree with the
+# settings below.
+entropy_cache_load="YES"		# Set this to NO to disable loading
+					# entropy at boot time
+entropy_cache_name="/boot/entropy"	# Set this to the name of the file
+entropy_cache_type="boot_entropy_cache"	# Required for the kernel to find
+					# the boot-time entropy cache. This
+					# must not change value even if the
+					# _name above does change!
+
+###  RAM Blacklist configuration  ############################
+ram_blacklist_load="NO"			# Set this to YES to load a file
+					# containing a list of addresses to
+					# exclude from the running system.
+ram_blacklist_name="/boot/blacklist.txt" # Set this to the name of the file
+ram_blacklist_type="ram_blacklist"	# Required for the kernel to find
+					# the blacklist module
+
+###  ACPI settings  ##########################################
+acpi_dsdt_load="NO"		# DSDT Overriding
+acpi_dsdt_type="acpi_dsdt"	# Don't change this
+acpi_dsdt_name="/boot/acpi_dsdt.aml"
+				# Override DSDT in BIOS by this file
+acpi_video_load="NO"		# Load the ACPI video extension driver
+
+###  Initial memory disk settings  ###########################
+#mdroot_load="YES"		# The "mdroot" prefix is arbitrary.
+#mdroot_type="md_image"		# Create md(4) disk at boot.
+#mdroot_name="/boot/root.img"	# Path to a file containing the image.
+#rootdev="ufs:/dev/md0"		# Set the root filesystem to md(4) device.
+
+###  Loader settings  ########################################
+#loader_delay="3"		# Delay in seconds before loading anything.
+				# Default is unset and disabled (no delay).
+#autoboot_delay="10"		# Delay in seconds before autobooting,
+				# -1 for no user interrupts, NO to disable
+#password=""			# Prevent changes to boot options
+#bootlock_password=""		# Prevent booting (see check-password.4th(8))
+#geom_eli_passphrase_prompt="NO" # Prompt for geli(8) passphrase to mount root
+bootenv_autolist="YES"		# Auto populate the list of ZFS Boot Environments
+#beastie_disable="NO"		# Turn the beastie boot menu on and off
+#kernels="kernel kernel.old"	# Kernels to display in the boot menu
+#loader_logo="orbbw"		# Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none
+#comconsole_speed="9600"	# Set the current serial console speed
+#console="vidconsole"		# A comma separated list of console(s)
+#currdev="disk1s1a"		# Set the current device
+module_path="/boot/modules;/boot/dtb;/boot/overlays"	# Set the module search path
+#prompt="\\${interpret}"	# Set the command prompt
+#root_disk_unit="0"		# Force the root disk unit number
+#rootdev="disk1s1a"		# Set the root filesystem
+#dumpdev="disk1s1b"		# Set a dump device early in the boot process
+#tftp.blksize="1428"		# Set the RFC 2348 TFTP block size.
+				# If the TFTP server does not support RFC 2348,
+				# the block size is set to 512. Valid: (8,9007)
+#twiddle_divisor="1"		# >1 means slow down the progress indicator.
+
+###  Kernel settings  ########################################
+# The following boot_ variables are enabled by setting them to any value.
+# Their presence in the kernel environment (see kenv(1)) has the same
+# effect as setting the given boot flag (see boot(8)).
+#boot_askname=""	# -a: Prompt the user for the name of the root device
+#boot_cdrom=""		# -C: Attempt to mount root file system from CD-ROM
+#boot_ddb=""		# -d: Instructs the kernel to start in the DDB debugger
+#boot_dfltroot=""	# -r: Use the statically configured root file system
+#boot_gdb=""		# -g: Selects gdb-remote mode for the kernel debugger
+#boot_multicons=""	# -D: Use multiple consoles
+#boot_mute=""		# -m: Mute the console
+#boot_pause=""		# -p: Pause after each line during device probing
+#boot_serial=""		# -h: Use serial console
+#boot_single=""		# -s: Start system in single-user mode
+#boot_verbose=""	# -v: Causes extra debugging information to be printed
+#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"
+			# Sets the list of init candidates
+#init_shell="/bin/sh"	# The shell binary used by init(8).
+#init_script=""		# Initial script to run by init(8) before chrooting.
+#init_chroot=""		# Directory for init(8) to chroot into.
+
+###  Kernel tunables  ########################################
+#hw.physmem="1G"		# Limit physical memory. See loader(8)
+#kern.dfldsiz=""		# Set the initial data size limit
+#kern.dflssiz=""		# Set the initial stack size limit
+#kern.hz="100"			# Set the kernel interval timer rate
+#kern.maxbcache=""		# Set the max buffer cache KVA storage
+#kern.maxdsiz=""		# Set the max data size
+#kern.maxfiles=""		# Set the sys. wide open files limit
+#kern.maxproc=""		# Set the maximum # of processes
+#kern.maxssiz=""		# Set the max stack size
+#kern.maxswzone=""		# Set the max swmeta KVA storage
+#kern.maxtsiz=""		# Set the max text size
+#kern.maxusers="32"		# Set size of various static tables
+#kern.msgbufsize="65536"	# Set size of kernel message buffer
+#kern.nbuf=""			# Set the number of buffer headers
+#kern.ncallout=""		# Set the maximum # of timer events
+#kern.ngroups="1023"		# Set the maximum # of supplemental groups
+#kern.sgrowsiz=""		# Set the amount to grow stack
+#kern.cam.boot_delay="10000"	# Delay (in ms) of root mount for CAM bus
+				# registration, useful for USB sticks as root
+#kern.cam.scsi_delay="2000"	# Delay (in ms) before probing SCSI
+#kern.ipc.maxsockets=""		# Set the maximum number of sockets available
+#kern.ipc.nmbclusters=""	# Set the number of mbuf clusters
+#kern.ipc.nsfbufs=""		# Set the number of sendfile(2) bufs
+#net.inet.tcp.tcbhashsize=""	# Set the value of TCBHASHSIZE
+#vfs.root.mountfrom=""		# Specify root partition
+#vm.kmem_size=""		# Sets the size of kernel memory (bytes)
+#debug.kdb.break_to_debugger="0" # Allow console to break into debugger.
+#debug.ktr.cpumask="0xf"	# Bitmask of CPUs to enable KTR on
+#debug.ktr.mask="0x1200"	# Bitmask of KTR events to enable
+#debug.ktr.verbose="1"		# Enable console dump of KTR events
+
+###  Module loading syntax example  ##########################
+#module_load="YES"		# loads module "module"
+#module_name="realname"		# uses "realname" instead of "module"
+#module_type="type"		# passes "-t type" to load
+#module_flags="flags"		# passes "flags" to the module
+#module_before="cmd"		# executes "cmd" before loading the module
+#module_after="cmd"		# executes "cmd" after loading the module
+#module_error="cmd"		# executes "cmd" if load fails
diff --git a/stand/forth/loader.conf.5 b/stand/defaults/loader.conf.5
index 631250c..f330349 100644
--- a/stand/forth/loader.conf.5
+++ b/stand/defaults/loader.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd January 6, 2016
+.Dd March 19, 2018
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -39,18 +39,6 @@ it, and additional modules to be loaded; and generally set all variables
 described in
 .Xr loader 8 .
 .Pp
-The file
-.Pa /boot/loader.rc
-must contain the following two lines for
-.Nm
-to be automatically processed:
-.Pp
-.Dl include /boot/loader.4th
-.Dl start
-.Pp
-If no
-.Pa /boot/loader.rc
-exists at installworld time, one with the above lines will be installed.
 .Sh SYNTAX
 Though
 .Nm Ns 's
@@ -261,7 +249,6 @@ be displayed.
 If set to
 .Dq YES ,
 the beastie boot menu will be skipped.
-The beastie boot menu is always skipped if running non-x86 hardware.
 .It Va loader_logo Pq Dq Li orbbw
 Selects a desired logo in the beastie boot menu.
 Possible values are:
@@ -290,20 +277,31 @@ See the entropy entries in
 The name of the very early
 boot-time entropy cache file.
 .El
+.Sh OTHER SETTINGS
+Other settings that may be used in
+.Nm
+that have no default value:
+.Bl -tag -width bootfile -offset indent
+.It Va fdt_overlays
+Specifies a comma-delimited list of FDT overlays to apply.
+.Pa /boot/overlays
+is created by default for overlays to be placed in.
+.It Va kernels_autodetect
+If set to
+.Dq YES ,
+attempt to auto-detect kernels installed in
+.Pa /boot .
+This is an option specific to the Lua-based loader.
+It is not available in the default Forth-based loader.
+.El
 .Sh FILES
 .Bl -tag -width /boot/defaults/loader.conf -compact
 .It Pa /boot/defaults/loader.conf
 default settings -- do not change this file.
-.It Pa /boot/loader.4th
-defines the commands used by loader to read and process
-.Nm .
 .It Pa /boot/loader.conf
 user defined settings.
 .It Pa /boot/loader.conf.local
 machine-specific settings for sites with a common loader.conf.
-.It Pa /boot/loader.rc
-contains the instructions to automatically process
-.Nm .
 .El
 .Sh SEE ALSO
 .Xr rc.conf 5 ,
diff --git a/stand/forth/Makefile b/stand/forth/Makefile
index 3d79dc1..0811168 100644
--- a/stand/forth/Makefile
+++ b/stand/forth/Makefile
@@ -7,7 +7,6 @@ MAN+=	beastie.4th.8 \
 	check-password.4th.8 \
 	color.4th.8 \
 	delay.4th.8 \
-	loader.conf.5 \
 	loader.4th.8 \
 	menu.4th.8 \
 	menusets.4th.8 \
@@ -33,10 +32,9 @@ FILES+=	screen.4th
 FILES+=	shortcuts.4th
 FILES+=	support.4th
 FILES+=	version.4th
-FILESDIR_loader.conf=	/boot/defaults
 
 # Allow machine specific loader.rc to be installed.
-.for f in loader.rc menu.rc loader.conf
+.for f in loader.rc menu.rc
 .if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f})
 FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}
 .else
diff --git a/stand/forth/loader.conf b/stand/forth/loader.conf
deleted file mode 100644
index 061918a..0000000
--- a/stand/forth/loader.conf
+++ /dev/null
@@ -1,576 +0,0 @@
-# This is loader.conf - a file full of useful variables that you can
-# set to change the default load behavior of your system. You should
-# not edit this file!  Put any overrides into one of the
-# loader_conf_files instead and you will be able to update these
-# defaults later without spamming your local configuration information.
-#
-# All arguments must be in double quotes.
-#
-# $FreeBSD$
-
-##############################################################
-###  Basic configuration options  ############################
-##############################################################
-
-exec="echo Loading /boot/defaults/loader.conf"
-
-kernel="kernel"		# /boot sub-directory containing kernel and modules
-bootfile="kernel"	# Kernel name (possibly absolute path)
-kernel_options=""	# Flags to be passed to the kernel
-
-loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local"
-nextboot_conf="/boot/nextboot.conf"
-nextboot_enable="NO"
-
-verbose_loading="NO"		# Set to YES for verbose loader output
-
-
-##############################################################
-###  Splash screen configuration  ############################
-##############################################################
-
-splash_bmp_load="NO"		# Set this to YES for bmp splash screen!
-splash_pcx_load="NO"		# Set this to YES for pcx splash screen!
-splash_txt_load="NO"		# Set this to YES for TheDraw splash screen!
-vesa_load="NO"			# Set this to YES to load the vesa module
-bitmap_load="NO"		# Set this to YES if you want splash screen!
-bitmap_name="splash.bmp"	# Set this to the name of the file
-bitmap_type="splash_image_data" # and place it on the module_path
-
-
-##############################################################
-###  Random number generator configuration  ##################
-##############################################################
-
-# See rc.conf(5). The entropy_boot_file config variable must agree with the
-# settings below.
-
-entropy_cache_load="YES"		# Set this to NO to disable loading
-					# entropy at boot time
-entropy_cache_name="/boot/entropy"	# Set this to the name of the file
-entropy_cache_type="/boot/entropy"	# Required for the kernel to find
-					# the boot-time entropy cache. This
-					# must not change value even if the
-					# _name above does change!
-
-
-##############################################################
-###  RAM Blacklist configuration  ############################
-##############################################################
-
-ram_blacklist_load="NO"			# Set this to YES to load a file
-					# containing a list of addresses to
-					# exclude from the running system.
-ram_blacklist_name="/boot/blacklist.txt" # Set this to the name of the file
-ram_blacklist_type="ram_blacklist"	# Required for the kernel to find
-					# the blacklist module
-
-
-##############################################################
-###  Initial memory disk settings  ###########################
-##############################################################
-
-#mdroot_load="YES"		# The "mdroot" prefix is arbitrary.
-#mdroot_type="md_image"		# Create md(4) disk at boot.
-#mdroot_name="/boot/root.img"	# Path to a file containing the image.
-#rootdev="ufs:/dev/md0"		# Set the root filesystem to md(4) device.
-
-
-##############################################################
-###  Loader settings  ########################################
-##############################################################
-
-#loader_delay="3"		# Delay in seconds before loading anything.
-				# Default is unset and disabled (no delay).
-#autoboot_delay="10"		# Delay in seconds before autobooting,
-				# set to -1 if you don't want user to be
-				# allowed to interrupt autoboot process and
-				# escape to the loader prompt, set to
-				# "NO" to disable autobooting
-#password=""			# Prevent changes to boot options
-#bootlock_password=""		# Prevent booting (see check-password.4th(8))
-#geom_eli_passphrase_prompt="NO" # Prompt for geli(8) passphrase to mount root
-bootenv_autolist="YES"		# Auto populate the list of ZFS Boot Environments
-#beastie_disable="NO"		# Turn the beastie boot menu on and off
-#kernels="kernel kernel.old"	# Kernels to display in the boot menu
-#loader_logo="orbbw"		# Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none
-#comconsole_speed="9600"	# Set the current serial console speed
-#console="vidconsole"		# A comma separated list of console(s)
-#currdev="disk1s1a"		# Set the current device
-module_path="/boot/modules;/boot/dtb"	# Set the module search path
-#prompt="\\${interpret}"	# Set the command prompt
-#root_disk_unit="0"		# Force the root disk unit number
-#rootdev="disk1s1a"		# Set the root filesystem
-#dumpdev="disk1s1b"		# Set a dump device early in the boot process
-#tftp.blksize="1428"		# Set the RFC 2348 TFTP block size.
-				# If the TFTP server does not support RFC 2348,
-				# the block size is set to 512.  If the value
-				# is out of range ( < 8 || > 9008 ) an error is
-				# returned.
-#twiddle_divisor="1"		# >1 means slow down the progress indicator.
-
-
-##############################################################
-###  Kernel settings  ########################################
-##############################################################
-
-# The following boot_ variables are enabled by setting them to any value.
-# Their presence in the kernel environment (see kenv(1)) has the same
-# effect as setting the given boot flag (see boot(8)).
-
-#boot_askname=""	# -a: Prompt the user for the name of the root device
-#boot_cdrom=""		# -C: Attempt to mount root file system from CD-ROM
-#boot_ddb=""		# -d: Instructs the kernel to start in the DDB debugger
-#boot_dfltroot=""	# -r: Use the statically configured root file system
-#boot_gdb=""		# -g: Selects gdb-remote mode for the kernel debugger
-#boot_multicons=""	# -D: Use multiple consoles
-#boot_mute=""		# -m: Mute the console
-#boot_pause=""		# -p: Pause after each line during device probing
-#boot_serial=""		# -h: Use serial console
-#boot_single=""		# -s: Start system in single-user mode
-#boot_verbose=""	# -v: Causes extra debugging information to be printed
-#init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init"
-			# Sets the list of init candidates
-#init_shell="/bin/sh"	# The shell binary used by init(8).
-#init_script=""		# Initial script to run by init(8) before chrooting.
-#init_chroot=""		# Directory for init(8) to chroot into.
-
-
-##############################################################
-###  Kernel tunables  ########################################
-##############################################################
-
-#hw.physmem="1G"		# Limit physical memory. See loader(8)
-#kern.dfldsiz=""		# Set the initial data size limit
-#kern.dflssiz=""		# Set the initial stack size limit
-#kern.hz="100"			# Set the kernel interval timer rate
-#kern.maxbcache=""		# Set the max buffer cache KVA storage
-#kern.maxdsiz=""		# Set the max data size
-#kern.maxfiles=""		# Set the sys. wide open files limit
-#kern.maxproc=""		# Set the maximum # of processes
-#kern.maxssiz=""		# Set the max stack size
-#kern.maxswzone=""		# Set the max swmeta KVA storage
-#kern.maxtsiz=""		# Set the max text size
-#kern.maxusers="32"		# Set size of various static tables
-#kern.msgbufsize="65536"	# Set size of kernel message buffer
-#kern.nbuf=""			# Set the number of buffer headers
-#kern.ncallout=""		# Set the maximum # of timer events
-#kern.ngroups="1023"		# Set the maximum # of supplemental groups
-#kern.sgrowsiz=""		# Set the amount to grow stack
-#kern.cam.boot_delay="10000"	# Delay (in ms) of root mount for CAM bus
-				# registration, useful for USB sticks as root
-#kern.cam.scsi_delay="2000"	# Delay (in ms) before probing SCSI
-#kern.ipc.maxsockets=""		# Set the maximum number of sockets available
-#kern.ipc.nmbclusters=""	# Set the number of mbuf clusters
-#kern.ipc.nsfbufs=""		# Set the number of sendfile(2) bufs
-#net.inet.tcp.tcbhashsize=""	# Set the value of TCBHASHSIZE
-#vfs.root.mountfrom=""		# Specify root partition in a way the
-				# kernel understands
-#vm.kmem_size=""		# Sets the size of kernel memory (bytes)
-#debug.kdb.break_to_debugger="0" # Allow console to break into debugger.
-#debug.ktr.cpumask="0xf"	# Bitmask of CPUs to enable KTR on
-#debug.ktr.mask="0x1200"	# Bitmask of KTR events to enable
-#debug.ktr.verbose="1"		# Enable console dump of KTR events
-#net.graph.maxalloc="128"	# Maximum number of queue items to allocate
-
-
-##############################################################
-###  ATA modules  ############################################
-##############################################################
-
-ataacard_load="NO"		# ACARD
-ataacerlabs_load="NO"		# Acer Labs Inc. (ALI)
-ataamd_load="NO"		# American Micro Devices (AMD)
-ataati_load="NO"		# ATI
-atacenatek_load="NO"		# Cenatek
-atacypress_load="NO"		# Cypress
-atacyrix_load="NO"		# Cyrix
-atahighpoint_load="NO"		# HighPoint
-ataintel_load="NO"		# Intel
-ataite_load="NO"		# Integrated Technology Inc. (ITE)
-atajmicron_load="NO"		# JMicron
-atamarvell_load="NO"		# Marvell
-atamicron_load="NO"		# Micron
-atanational_load="NO"		# National
-atanetcell_load="NO"		# NetCell
-atanvidia_load="NO"		# nVidia
-atapromise_load="NO"		# Promise
-ataserverworks_load="NO"	# ServerWorks
-atasiliconimage_load="NO"	# Silicon Image Inc. (SiI) (formerly CMD)
-atasis_load="NO"		# Silicon Integrated Systems Corp.(SiS)
-atavia_load="NO"		# VIA Technologies Inc.
-
-
-##############################################################
-###  Filesystem and related modules  #########################
-##############################################################
-
-# Filesystems
-
-cd9660_load="NO"		# ISO 9660 filesystem
-fdescfs_load="NO"		# Filedescriptors filesystem
-linprocfs_load="NO"		# Linux compatibility process filesystem
-linsysfs_load="NO"		# Linux compatibility system filesystem
-msdosfs_load="NO"		# FAT-12/16/32
-nfsclient_load="NO"		# NFS client
-nfsserver_load="NO"		# NFS server
-nullfs_load="NO"		# Null filesystem
-procfs_load="NO"		# Process filesystem
-unionfs_load="NO"		# Union filesystem
-zfs_load="NO"   		# ZFS
-
-# Related stuff
-
-geom_bde_load="NO"		# Disk encryption driver (see gbde(4,8))
-geom_ccd_load="NO"		# Concatenated disk driver (see ccd(4),
-				# ccdconfig(8))
-geom_concat_load="NO"		# Concatenated disk driver (see gconcat(8))
-geom_eli_load="NO"		# Disk encryption driver (see geli(8))
-geom_gate_load="NO"		# Userland disk driver (see geom_gate(4),
-				# ggatec(8), ggated(8), ggatel(8))
-geom_journal_load="NO"		# Journaled filesystem driver (see gjournal(8))
-geom_label_load="NO"		# File system labels (see glabel(8))
-geom_md_load="NO"		# Memory disk driver (vnode/swap/malloc) (see
-				# md(4), mdconfig(8))
-geom_mirror_load="NO"		# RAID1 disk driver (see gmirror(8))
-geom_mountver_load="NO"		# Mount verification disk driver
-geom_nop_load="NO"		# Transparent disk driver (see gnop(8))
-geom_raid3_load="NO"		# RAID3 disk driver (see graid3(8))
-geom_shsec_load="NO"		# Shared secret disk driver (see gshsec(8))
-geom_stripe_load="NO"		# RAID0 disk driver (see gstripe(8))
-geom_uzip_load="NO"		# Compressed disk images driver (see mkuzip(8))
-geom_vinum_load="NO"		# Concatenated/mirror/raid driver (see vinum(4))
-
-
-##############################################################
-###  FireWire modules  #######################################
-##############################################################
-
-firewire_load="NO"              # IEEE1394 High-performance Serial Bus
-fwe_load="NO"                   # Ethernet emulation driver for FireWire
-fwip_load="NO"                  # IP over FireWire driver
-fwohci_load="NO"                # OHCI FireWire chipset device driver
-sbp_load="NO"                   # SBP-2 Mass Storage Devices driver
-sbp_targ_load="NO"		# SBP-2 Target mode
-
-
-##############################################################
-###  Screen saver modules  ###################################
-##############################################################
-
-# This is best done in rc.conf
-
-screensave_load="NO"		# Set to YES to load a screensaver module
-screensave_name="green_saver"	# Set to the name of the screensaver module
-
-
-##############################################################
-###  Emulation modules  ######################################
-##############################################################
-
-cloudabi_load="NO"		# Platform independent CloudABI support
-cloudabi64_load="NO"		# 64-bit CloudABI executables support
-ibcs2_load="NO"			# IBCS2 (SCO) emulation
-ibcs2_coff_load="NO"
-linux_load="NO"			# Linux emulation
-svr4_load="NO"			# SystemV R4 emulation
-streams_load="NO"		# System V streams module
-
-
-##############################################################
-###  Networking modules  #####################################
-##############################################################
-
-if_disc_load="NO"		# Discard device
-if_ef_load="NO"			# pseudo-device providing support for multiple
-				# ethernet frame types
-if_epair_load="NO"		# Virtual b-t-b Ethernet-like interface pair
-if_gif_load="NO"		# generic tunnel interface
-if_gre_load="NO"		# encapsulating network device
-if_stf_load="NO"		# 6to4 tunnel interface
-if_tap_load="NO"		# Ethernet tunnel software network interface
-if_tun_load="NO"		# Tunnel driver (user process ppp)
-if_vlan_load="NO"		# IEEE 802.1Q VLAN network interface
-ipfw_load="NO"			# Firewall
-pf_load="NO"			# packet filter
-
-
-##############################################################
-###  Networking drivers  #####################################
-##############################################################
-
-bridgestp_load="NO"		# if_bridge(4) support
-miibus_load="NO"		# miibus support, needed for some drivers
-carp_load="NO"			# carp(4) protocol
-if_ae_load="NO"			# Attansic/Atheros L2 FastEthernet
-if_age_load="NO"		# Attansic/Atheros L1 Gigabit Ethernet
-if_alc_load="NO"		# Atheros AR8131/AR8132 Ethernet
-if_ale_load="NO"		# Atheros AR8121/AR8113/AR8114 Ethernet
-if_an_load="NO"			# Aironet 4500/4800 802.11 wireless NICs
-if_ath_load="NO"		# Atheros IEEE 802.11 wireless NICs
-if_aue_load="NO"		# ADMtek AN986 Pegasus USB Ethernet
-if_axe_load="NO"		# ASIX Electronics AX88172 USB Ethernet
-if_bce_load="NO"		# Broadcom NetXtreme II Gigabit Ethernet
-if_bfe_load="NO"		# Broadcom BCM4401
-if_bge_load="NO"		# Broadcom BCM570x PCI Gigabit Ethernet
-if_bnxt_load="NO"		# Broadcom NetXtreme-C/NetXtreme-E
-if_bridge_load="NO"		# if_bridge(4) devices
-if_bwi_load="NO"		# Broadcom BCM53xx IEEE 802.11b/g wireness NICs
-if_bwn_load="NO"		# Broadcom BCM43xx IEEE 802.11 wireless NICs
-if_bxe_load="NO"		# Broadcom NetXtreme II 10Gb Ethernet
-if_cas_load="NO"		# Sun Cassini/Cassini+ and NS DP83065 Saturn
-if_cm_load="NO"			# SMC (90c26, 90c56, 90c66)
-if_cs_load="NO"			# Crystal Semiconductor CS8920
-if_cue_load="NO"		# CATC USB-EL1210A USB Ethernet
-if_cxgb_load="NO"		# Chelsio T3 10 Gigabit Ethernet
-if_cxgbe_load="NO"		# Chelsio T4/T5/T6 1/10/25/40/100 Gigabit Ethernet
-if_dc_load="NO"			# DEC/Intel 21143 and various workalikes
-if_de_load="NO"			# DEC DC21x4x Ethernet
-if_ed_load="NO"			# National Semiconductor DS8390/WD83C690
-				# Ethernet
-if_em_load="NO"			# Intel(R) PRO/1000 Gigabit Ethernet
-if_en_load="NO"			# Midway-based ATM interfaces
-if_ep_load="NO"			# 3Com Etherlink III (3c5x9)
-if_et_load="NO"			# Agere ET1310 10/100/Gigabit Ethernet
-if_ex_load="NO"			# Intel EtherExpress Pro/10 Ethernet
-if_fatm_load="NO"		# Fore PCA200E ATM
-if_fe_load="NO"			# Fujitsu MB86960A/MB86965A based Ethernet
-				# adapters
-if_fxp_load="NO"		# Intel EtherExpress PRO/100B (82557, 82558)
-if_gem_load="NO"		# Sun GEM/Sun ERI/Apple GMAC
-if_hatm_load="NO"		# Fore/Marconi HE155 and HE622
-if_hme_load="NO"		# Sun Microelectronics STP2002-STQ Ethernet
-if_ie_load="NO"			# Intel 82586
-if_igb_load="NO"		# Intel(R) PRO/1000 Gigabit Ethernet
-if_ipw_load="NO"		# Intel PRO/Wireless 2100 wireless
-if_iwi_load="NO"		# Intel PRO/Wireless 2200BG/2225BG/2915ABG
-				# wireless
-if_iwn_load="NO"		# Intel Wireless WiFi Link 802.11n wireless
-if_ixgb_load="NO"		# Intel PRO/10Gb Ethernet
-if_ixgbe_load="NO"		# Intel PRO/10Gb Ethernet PCI Express
-if_ixl_load="NO"		# Intel XL710 Ethernet 40Gb Base driver
-if_ixlv_load="NO"		# Intel XL710 Ethernet 40Gb VF driver
-if_jme_load="NO"		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
-if_lagg_load="NO"		# lagg(4) devices
-if_le_load="NO"			# AMD Am7900 LANCE and Am79C9xx PCnet
-if_lge_load="NO"		# Level 1 LXT1001 NetCellerator PCI Gigabit
-				# Ethernet
-if_malo_load="NO"		# Marvell Libertas 88W8335 802.11 wireless
-				# adapter
-if_msk_load="NO"		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-if_mxge_load="NO"		# Myricom Myri10GE 10Gb Ethernet
-if_my_load="NO"			# Myson PCI Fast Ethernet
-if_nfe_load="NO"		# NVIDIA nForce MCP Networking Adapter
-if_nge_load="NO"		# National Semiconductor PCI Gigabit Ethernet
-if_nxge_load="NO"		# Neterion Xframe 10Gb Ethernet
-if_patm_load="NO"		# IDT77252 ATM
-if_pcn_load="NO"		# AMD PCnet PCI
-if_ral_load="NO"		# Ralink Technology wireless
-if_re_load="NO"			# RealTek 8139C+/8169/8169S/8110S
-if_rl_load="NO"			# RealTek 8129/8139
-if_rue_load="NO"		# RealTek RTL8150 USB to Fast Ethernet
-if_rum_load="NO"		# Ralink Technology USB 802.11a/b/g wireless
-if_run_load="NO"		# Ralink Technology USB 802.11a/g/n wireless
-if_sbni_load="NO"		# Granch SBNI12 leased line adapters
-if_sf_load="NO"			# Adaptec Duralink PCI (AIC-6915 "starfire")
-if_sge_load="NO"		# Silicon Integrated Systems SiS 190/191
-if_sis_load="NO"		# Silicon Integrated Systems SiS 900/7016
-if_sk_load="NO"			# SysKonnect SK-984x series PCI Gigabit Ethernet
-if_sn_load="NO"			# SMC 91Cxx
-if_ste_load="NO"		# Sundance Technologies ST201 Fast Ethernet
-if_stge_load="NO"		# Sundance/Tamarack TC9021 Gigabit Ethernet
-if_ti_load="NO"			# Alteon Networks Tigon 1 and Tigon 2
-if_tl_load="NO"			# Texas Instruments TNETE100 ("ThunderLAN")
-if_tx_load="NO"			# SMC 83c17x Fast Ethernet
-if_txp_load="NO"		# 3Com 3XP Typhoon/Sidewinder (3CR990)
-if_vge_load="NO"		# VIA VT6122 PCI Gigabit Ethernet
-if_vte_load="NO"		# DM&P Vortex86 RDC R6040 Fast Ethernet
-if_uath_load="NO"		# Atheros USB wireless for AR5005UG & AR5005UX
-if_udav_load="NO"		# Davicom DM9601 USB Ethernet
-if_upgt_load="NO"		# Conexant/Intersil PrismGT USB wireless
-if_ural_load="NO"		# Ralink Technology USB wireless
-if_urtw_load="NO"		# Realtek 8187L USB wireless
-if_vr_load="NO"			# VIA Rhine I and Rhine II
-if_vx_load="NO"			# 3Com 3C590 family
-if_wb_load="NO"			# Winbond W89C840F
-if_wi_load="NO"			# WaveLAN/IEEE 802.11 wireless NICs
-if_wpi_load="NO"		# Intel 3945ABG Wireless LAN IEEE 802.11
-if_xe_load="NO"			# Xircom CreditCard PCMCIA
-if_xl_load="NO"			# 3Com Etherlink XL (3c900, 3c905, 3c905B)
-sfxge_load="NO"			# Solarflare 10Gb Ethernet adapter driver
-utopia_load="NO"		# ATM PHY driver
-
-
-##############################################################
-###  Netgraph modules  #######################################
-##############################################################
-
-ng_UI_load="NO"			# UI netgraph node type
-ng_async_load="NO"		# asynchronous framing netgraph node type
-ng_bpf_load="NO"		# Berkeley packet filter netgraph node type
-ng_bridge_load="NO"		# Ethernet bridging netgraph node type
-ng_cisco_load="NO"		# Cisco HDLC protocol netgraph node type
-ng_echo_load="NO"		# Netgraph echo node type
-ng_eiface_load="NO"		# generic Ethernet interface netgraph node type
-ng_etf_load="NO"		# Ethertype filtering netgraph node type
-ng_ether_load="NO"		# Ethernet netgraph node type
-ng_frame_relay_load="NO"	# frame relay netgraph node type
-ng_gif_load="NO"		# generic tunnel interface netgraph node type
-ng_gif_demux_load="NO"		# demultiplexer for packets from ng_gif(4) nodes
-ng_hole_load="NO"		# Netgraph discard node type
-ng_hub_load="NO"		# packet distribution netgraph node type
-ng_iface_load="NO"		# interface Netgraph node type
-ng_ip_input_load="NO"		# netgraph IP input node type
-ng_ksocket_load="NO"		# kernel socket netgraph node type
-ng_l2tp_load="NO"		# L2TP protocol netgraph node type
-ng_lmi_load="NO"		# frame relay LMI protocol netgraph node type
-ng_mppc_load="NO"		# Microsoft MPPC/MPPE compression and
-				# encryption netgraph node type
-ng_netflow_load="NO"		# Cisco's NetFlow netgraph node type
-ng_one2many_load="NO"		# packet multiplexing netgraph node type
-ng_ppp_load="NO"		# PPP protocol netgraph node type
-ng_pppoe_load="NO"		# RFC 2516 PPPOE protocol netgraph node type
-ng_pptpgre_load="NO"		# PPTP GRE protocol netgraph node type
-ng_rfc1490_load="NO"		# RFC 1490 netgraph node type
-ng_socket_load="NO"		# Netgraph socket node type
-ng_split_load="NO"		# netgraph node to separate incoming and
-				# outgoing flows
-ng_sppp_load="NO"		# sppp netgraph node type
-ng_tee_load="NO"		# Netgraph ``tee'' node type
-ng_tty_load="NO"		# Netgraph node type that is also a line
-				# discipline
-ng_vjc_load="NO"		# Van Jacobsen compression netgraph node type
-ng_vlan_load="NO"		# IEEE 802.1Q VLAN tagging netgraph node type
-
-
-##############################################################
-###  Sound modules  ##########################################
-##############################################################
-
-sound_load="NO"			# Digital sound subsystem
-snd_ad1816_load="NO"		# ad1816
-snd_als4000_load="NO"		# als4000
-snd_atiixp_load="NO"		# atiixp
-snd_cmi_load="NO"		# cmi
-snd_cs4281_load="NO"		# cs4281
-snd_csa_load="NO"		# csa
-snd_ds1_load="NO"		# ds1
-snd_emu10k1_load="NO" 		# Creative Sound Blaster Live
-snd_emu10kx_load="NO" 		# Creative SoundBlaster Live! and Audigy
-snd_envy24_load="NO"		# VIA Envy24
-snd_envy24ht_load="NO"		# VIA Envy24HT
-snd_es137x_load="NO"		# es137x
-snd_ess_load="NO"		# ess
-snd_fm801_load="NO"		# fm801
-snd_hda_load="NO"		# Intel High Definition Audio (Controller)
-snd_ich_load="NO"		# Intel ICH
-snd_maestro_load="NO"		# Maestro
-snd_maestro3_load="NO"		# Maestro3
-snd_mss_load="NO"		# Mss
-snd_neomagic_load="NO"		# Neomagic
-snd_sb16_load="NO"		# Sound Blaster 16
-snd_sb8_load="NO"		# Sound Blaster Pro
-snd_sbc_load="NO"		# Sbc
-snd_solo_load="NO"		# Solo
-snd_spicds_load="NO"		# SPI codecs
-snd_t4dwave_load="NO"		# t4dwave
-snd_via8233_load="NO"		# via8233
-snd_via82c686_load="NO"		# via82c686
-snd_vibes_load="NO"		# vibes
-snd_driver_load="NO"		# All sound drivers
-
-
-##############################################################
-###  USB modules  ############################################
-##############################################################
-
-usb_load="NO"			# USB subsystem
-udbp_load="NO"			# USB double bulk pipe host 2 host cables
-ugen_load="NO"			# USB generic device, if all else fails ...
-ucycom_load="NO"		# Cyprus USB serial adapters
-ufm_load="NO"			# Fm Radio
-uhid_load="NO"			# Human Interface Devices
-ukbd_load="NO"			# Keyboard
-ulpt_load="NO"			# Printer
-ums_load="NO"			# Mouse
-umass_load="NO"			# Mass Storage Devices
-umct_load="NO"			# Magic Control Technology USB-RS232
-umodem_load="NO"		# Modems
-uplcom_load="NO"		# Prolific USB serial adapters
-urio_load="NO"			# Rio MP3 players
-uvisor_load="NO"		# PalmOS based PDAs
-if_aue_load="NO"		# ADMtek USB ethernet
-if_axe_load="NO"		# ASIX Electronics AX88172 USB ethernet
-if_cdce_load="NO"		# Ethernet over USB (CDC)
-if_cue_load="NO"		# CATC USB ethernet
-if_kue_load="NO"		# Kawasaki LSI USB ethernet
-if_rae_load="NO"		# Realtek RTL8150 USB adapter.
-if_rum_load="NO"		# Ralink USB 802.11 wireless adapter
-if_uath_load="NO"		# Atheros AR5523 wireless adapter
-if_run_load="NO"		# Ralink USB 802.11 wireless adapter
-if_ural_load="NO"		# Ralink RT2500USB 802.11 wireless adapter
-if_zyd_load="NO"		# ZyDAS ZD1211(B) USB 802.11 wireless adapter
-snd_uaudio_load="NO"		# USB audio
-
-
-##############################################################
-###  Other modules  ##########################################
-##############################################################
-
-aio_load="NO"			# Asynchronous I/O
-bktr_load="NO"			# Brooktree Bt848/Bt878 TV/Video Capture Card
-ispfw_load="NO"			# Qlogic ISP Firmware
-agp_load="NO"			# agp module
-accf_data_load="NO"		# Wait for data accept filter
-accf_dns_load="NO"		# Wait for full DNS request accept filter
-accf_http_load="NO"		# Wait for full HTTP request accept filter
-ppi_load="NO"			# Interface to ppbus parallel 'geek' port
-pps_load="NO"			# Pulse per second devices
-puc_load="NO"			# PCI "Universal" Communications driver
-random_load="NO"		# Random device
-speaker_load="NO"		# AT speaker module
-coretemp_load="NO"		# Intel Core CPU temperature monitor
-vkbd_load="NO"			# Virtual AT keyboard interface
-vpd_load="NO"			# Vital Product Data kernel interface
-vpo_load="NO"			# Parallel to SCSI interface driver
-amdsmn_load="NO"		# AMD Family 17h System Management Network
-amdtemp_load="NO"		# AMD K8/K10/K11 temperature monitor
-tpm_load="NO"			# Trusted Platform Module
-wbwd_load="NO"			# Winbond watchdog
-
-
-##############################################################
-###  ACPI settings  ##########################################
-##############################################################
-
-acpi_dsdt_load="NO"		# DSDT Overriding
-acpi_dsdt_type="acpi_dsdt"	# Don't change this
-acpi_dsdt_name="/boot/acpi_dsdt.aml"
-				# Override DSDT in BIOS by this file
-acpi_video_load="NO"		# Load the ACPI video extension driver
-
-
-##############################################################
-###  TrustedBSD MAC settings  ################################
-##############################################################
-
-mac_biba_load="NO"		# Biba MAC policy
-mac_bsdextended_load="NO"	# BSD/extended MAC policy
-mac_ifoff="NO"			# Interface silencing policy
-mac_mls_load="NO"		# MLS MAC policy
-mac_none_load="NO"		# Null MAC policy
-mac_partition_load="NO"		# Partition MAC policy
-mac_seeotheruids_load="NO"	# UID visbility MAC policy
-
-
-##############################################################
-###  Module loading syntax example  ##########################
-##############################################################
-
-#module_load="YES"		# loads module "module"
-#module_name="realname"		# uses "realname" instead of "module"
-#module_type="type"		# passes "-t type" to load
-#module_flags="flags"		# passes "flags" to the module
-#module_before="cmd"		# executes "cmd" before loading the module
-#module_after="cmd"		# executes "cmd" after loading the module
-#module_error="cmd"		# executes "cmd" if load fails
diff --git a/stand/mips/uboot/loader.conf b/stand/mips/uboot/loader.conf
deleted file mode 100644
index dd2a23a..0000000
--- a/stand/mips/uboot/loader.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is defaults/loader.conf for ARM, containing defaults for loader(8).
-# Do not modify the contents of this file, instead put your customizations
-# into /boot/loader.conf or /boot/loader.conf.local
-# $FreeBSD$
-
-autoboot_delay=10
-bootfile="kernel"      # Kernel name (possibly absolute path)
-kernel="kernel"        # /boot sub-directory containing kernel and modules
-loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
-module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays"
-nextboot_conf="/boot/nextboot.conf"
-nextboot_enable="NO"
-verbose_loading="NO"