aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2017-11-13 20:39:43 +0000
committerWarner Losh <imp@FreeBSD.org>2017-11-13 20:39:43 +0000
commitd6be6d496cdc2a1d3e5af8826c63110ef90b1d3f (patch)
tree044437ba319082d433ac85990494b140704bc466
parent7202739f7b928bd1c6ec5c999783a671cbf5f374 (diff)
downloadsrc-d6be6d496cdc2a1d3e5af8826c63110ef90b1d3f.tar.gz
src-d6be6d496cdc2a1d3e5af8826c63110ef90b1d3f.zip
Add loader.conf to the list of files that are MD.
loader.conf is also different between machines. On arm it's a minimal one that's not quite compatible with the default one. On arm it's minimal for speed, which is good, but there's also extra things in it relative to the default on which break loading FDT which is bad. This doesn't address that issue, but instead ensures the minimal one for arm is used. A similar issue for mips exists, but since we can have a beri variant of /boot/loader and a uboot variant, I'm leaving that mess alone for the moment. Sponsored by: Netflix
Notes
Notes: svn path=/head/; revision=325775
-rw-r--r--sys/boot/arm/loader/loader.conf (renamed from sys/boot/arm/uboot/loader.conf)0
-rw-r--r--sys/boot/forth/Makefile3
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/boot/arm/uboot/loader.conf b/sys/boot/arm/loader/loader.conf
index 4154ab7bcc9f..4154ab7bcc9f 100644
--- a/sys/boot/arm/uboot/loader.conf
+++ b/sys/boot/arm/loader/loader.conf
diff --git a/sys/boot/forth/Makefile b/sys/boot/forth/Makefile
index 89a1ddf19c59..74d9ed744322 100644
--- a/sys/boot/forth/Makefile
+++ b/sys/boot/forth/Makefile
@@ -22,7 +22,6 @@ 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
@@ -39,7 +38,7 @@ 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