Index: head/sys/boot/arm/loader/loader.conf
===================================================================
--- head/sys/boot/arm/loader/loader.conf	(nonexistent)
+++ head/sys/boot/arm/loader/loader.conf	(revision 325775)
@@ -0,0 +1,13 @@
+# 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"
+nextboot_conf="/boot/nextboot.conf"
+nextboot_enable="NO"
+verbose_loading="NO"

Property changes on: head/sys/boot/arm/loader/loader.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sys/boot/arm/uboot/loader.conf
===================================================================
--- head/sys/boot/arm/uboot/loader.conf	(revision 325774)
+++ head/sys/boot/arm/uboot/loader.conf	(nonexistent)
@@ -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"
-nextboot_conf="/boot/nextboot.conf"
-nextboot_enable="NO"
-verbose_loading="NO"

Property changes on: head/sys/boot/arm/uboot/loader.conf
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sys/boot/forth/Makefile
===================================================================
--- head/sys/boot/forth/Makefile	(revision 325774)
+++ head/sys/boot/forth/Makefile	(revision 325775)
@@ -1,50 +1,49 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 MAN+=	beastie.4th.8 \
 	brand.4th.8 \
 	check-password.4th.8 \
 	color.4th.8 \
 	delay.4th.8 \
 	loader.conf.5 \
 	loader.4th.8 \
 	menu.4th.8 \
 	menusets.4th.8 \
 	version.4th.8
 
 FILES+=	beastie.4th
 FILES+=	brand.4th
 FILES+=	brand-fbsd.4th
 FILES+=	check-password.4th
 FILES+=	color.4th
 FILES+=	delay.4th
 FILES+=	efi.4th
 FILES+=	frames.4th
 FILES+=	loader.4th
-FILES+=	loader.conf
 FILES+=	logo-beastie.4th
 FILES+=	logo-beastiebw.4th
 FILES+=	logo-fbsdbw.4th
 FILES+=	logo-orb.4th
 FILES+=	logo-orbbw.4th
 FILES+=	menu.4th
 FILES+=	menu-commands.4th
 FILES+=	menusets.4th
 FILES+=	pcibios.4th
 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
+.for f in loader.rc menu.rc loader.conf
 .if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f})
 FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}
 .else
 FILES+= ${f}
 .endif
 .endfor
 
 .include <bsd.prog.mk>