diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-11-13 20:39:43 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-11-13 20:39:43 +0000 |
| commit | d6be6d496cdc2a1d3e5af8826c63110ef90b1d3f (patch) | |
| tree | 044437ba319082d433ac85990494b140704bc466 | |
| parent | 7202739f7b928bd1c6ec5c999783a671cbf5f374 (diff) | |
Notes
| -rw-r--r-- | sys/boot/arm/loader/loader.conf (renamed from sys/boot/arm/uboot/loader.conf) | 0 | ||||
| -rw-r--r-- | sys/boot/forth/Makefile | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/boot/arm/uboot/loader.conf b/sys/boot/arm/loader/loader.conf index 4154ab7bcc9f9..4154ab7bcc9f9 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 89a1ddf19c590..74d9ed7443220 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 |