summaryrefslogtreecommitdiffstats
path: root/sys/boot/arm
diff options
context:
space:
mode:
authorloos <loos@FreeBSD.org>2015-07-08 23:50:04 +0000
committerloos <loos@FreeBSD.org>2015-07-08 23:50:04 +0000
commit13177b16bbe6c2322f7dbe8a7306427cee043a17 (patch)
tree4c60e917ab5a48a928986b025927aefae4194e41 /sys/boot/arm
parent2ba8e41f9e7474b40923e02735dc5f527818594d (diff)
downloadFreeBSD-src-13177b16bbe6c2322f7dbe8a7306427cee043a17.zip
FreeBSD-src-13177b16bbe6c2322f7dbe8a7306427cee043a17.tar.gz
MFC r285138:
Install loader.rc with ARM u-boot loader (ubldr). loader.rc is the responsible to read and process loader.conf variables. This fix the issue of loader.conf being silently ignored. Approved by: re (gjb)
Diffstat (limited to 'sys/boot/arm')
-rw-r--r--sys/boot/arm/uboot/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile
index 1e073b2..0c1a14f 100644
--- a/sys/boot/arm/uboot/Makefile
+++ b/sys/boot/arm/uboot/Makefile
@@ -149,10 +149,9 @@ CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin
.PATH: ${.CURDIR}/../../forth
.include "${.CURDIR}/../../forth/Makefile.inc"
-# Put sample loader.rc and menu.rc on disk but don't enable them
-# by default.
+# Install loader.rc.
FILES+= loader.rc
-FILESNAME_loader.rc= loader.rc.sample
+# Put sample menu.rc on disk but don't enable it by default.
FILES+= menu.rc
FILESNAME_menu.rc= menu.rc.sample
.endif
OpenPOWER on IntegriCloud