d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add loader.conf to the list of files that are MD.

Browse Source 
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
This commit is contained in:
Warner Losh 2017-11-13 20:39:43 +00:00
parent 7202739f7b
commit d6be6d496c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sys/boot/arm/uboot/loader.conf → sys/boot/arm/loader/loader.conf
View File

3
sys/boot/forth/Makefile
View File

@ -22,7 +22,6 @@ FILES+= delay.4th
FILES+= efi.4th FILES+= efi.4th
FILES+= frames.4th FILES+= frames.4th
FILES+= loader.4th FILES+= loader.4th
FILES+= loader.conf
FILES+= logo-beastie.4th FILES+= logo-beastie.4th
FILES+= logo-beastiebw.4th FILES+= logo-beastiebw.4th
FILES+= logo-fbsdbw.4th FILES+= logo-fbsdbw.4th
@ -39,7 +38,7 @@ FILES+= version.4th
FILESDIR_loader.conf= /boot/defaults FILESDIR_loader.conf= /boot/defaults
# Allow machine specific loader.rc to be installed. # 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}) .if exists(${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f})
FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f} FILES+= ${BOOTSRC}/${MACHINE:C/amd64/i386/}/loader/${f}
.else .else