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.

stand/Makefile

@@ -13,6 +13,7 @@ SUBDIR+=		liblua
 SUBDIR+=		lua
 .endif
 
+SUBDIR+=		defaults
 SUBDIR+=		man
 
 .include <bsd.arch.inc.mk>

stand/arm/loader/loader.conf

@@ -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"

stand/defaults/Makefile

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+NO_OBJ=t
+
+.include <bsd.init.mk>
+
+FILES+=	loader.conf
+FILES+= loader.conf.5
+
+FILESDIR_loader.conf=  /boot/defaults
+
+.include <bsd.prog.mk>

stand/forth/Makefile

@@ -9,7 +9,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 \
@@ -35,10 +34,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

stand/mips/uboot/loader.conf

@@ -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"