Date: Mon, 13 Nov 2017 20:39:43 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325775 - in head/sys/boot: arm/loader arm/uboot forth Message-ID: <201711132039.vADKdh6c027508@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Nov 13 20:39:43 2017 New Revision: 325775 URL: https://svnweb.freebsd.org/changeset/base/325775 Log: 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 Added: head/sys/boot/arm/loader/ head/sys/boot/arm/loader/loader.conf (contents, props changed) - copied, changed from r325765, head/sys/boot/arm/uboot/loader.conf Deleted: head/sys/boot/arm/uboot/loader.conf Modified: head/sys/boot/forth/Makefile Copied and modified: head/sys/boot/arm/loader/loader.conf (from r325765, head/sys/boot/arm/uboot/loader.conf) ============================================================================== Modified: head/sys/boot/forth/Makefile ============================================================================== --- head/sys/boot/forth/Makefile Mon Nov 13 20:16:33 2017 (r325774) +++ head/sys/boot/forth/Makefile Mon Nov 13 20:39:43 2017 (r325775) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711132039.vADKdh6c027508>