From owner-svn-src-head@freebsd.org Mon Nov 13 20:39:44 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D13CBDD50EB; Mon, 13 Nov 2017 20:39:44 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84FAA7D178; Mon, 13 Nov 2017 20:39:44 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vADKdhVO027510; Mon, 13 Nov 2017 20:39:43 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vADKdh6c027508; Mon, 13 Nov 2017 20:39:43 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201711132039.vADKdh6c027508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 13 Nov 2017 20:39:43 +0000 (UTC) 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 X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/boot: arm/loader arm/uboot forth X-SVN-Commit-Revision: 325775 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Nov 2017 20:39:44 -0000 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