From owner-svn-src-all@freebsd.org Thu Jan 18 04:58:56 2018 Return-Path: Delivered-To: svn-src-all@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 D0F9DE7F368; Thu, 18 Jan 2018 04:58:56 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61E9F77851; Thu, 18 Jan 2018 04:58:56 +0000 (UTC) (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C59919ABB; Thu, 18 Jan 2018 04:58:55 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0I4wtgT088257; Thu, 18 Jan 2018 04:58:55 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0I4wsn9088252; Thu, 18 Jan 2018 04:58:54 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201801180458.w0I4wsn9088252@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 18 Jan 2018 04:58:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328107 - in head: etc/mtree share/man/man7 stand/arm/loader stand/forth stand/mips/uboot X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head: etc/mtree share/man/man7 stand/arm/loader stand/forth stand/mips/uboot X-SVN-Commit-Revision: 328107 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Jan 2018 04:58:56 -0000 Author: kevans Date: Thu Jan 18 04:58:54 2018 New Revision: 328107 URL: https://svnweb.freebsd.org/changeset/base/328107 Log: stand: Add /boot/overlays to allow separation of overlays from base FDT This matches directory structure used commonly in Linux-land, and it's cleaner than mixing overlays into the existing module paths. Overlays are still mixed in by specifying fdt_overlays in loader.conf(5). Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D13922 Modified: head/etc/mtree/BSD.root.dist head/share/man/man7/hier.7 head/stand/arm/loader/loader.conf head/stand/forth/loader.conf head/stand/mips/uboot/loader.conf Modified: head/etc/mtree/BSD.root.dist ============================================================================== --- head/etc/mtree/BSD.root.dist Thu Jan 18 04:39:09 2018 (r328106) +++ head/etc/mtree/BSD.root.dist Thu Jan 18 04:58:54 2018 (r328107) @@ -18,6 +18,8 @@ .. modules .. + overlays + .. zfs .. .. Modified: head/share/man/man7/hier.7 ============================================================================== --- head/share/man/man7/hier.7 Thu Jan 18 04:39:09 2018 (r328106) +++ head/share/man/man7/hier.7 Thu Jan 18 04:58:54 2018 (r328107) @@ -28,7 +28,7 @@ .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd December 3, 2017 +.Dd January 15, 2018 .Dt HIER 7 .Os .Sh NAME @@ -63,6 +63,11 @@ at boot time) and kernel modules third-party loadable kernel modules; see .Xr kldstat 8 +.It Pa overlays/ +Compiled flattened device tree (FDT) overlays; see +.Xr fdt 4 +and +.Xr dtc 1 .It Pa zfs/ .Xr zfs 8 zpool cache files Modified: head/stand/arm/loader/loader.conf ============================================================================== --- head/stand/arm/loader/loader.conf Thu Jan 18 04:39:09 2018 (r328106) +++ head/stand/arm/loader/loader.conf Thu Jan 18 04:58:54 2018 (r328107) @@ -7,7 +7,7 @@ autoboot_delay=10 bootfile="kernel" # Kernel name (possibly absolute path) kernel="kernel" # /boot sub-directory containing kernel and modules loader_conf_files="/boot/loader.conf /boot/loader.conf.local" -module_path="/boot/kernel;/boot/modules;/boot/dtb" +module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays" nextboot_conf="/boot/nextboot.conf" nextboot_enable="NO" verbose_loading="NO" Modified: head/stand/forth/loader.conf ============================================================================== --- head/stand/forth/loader.conf Thu Jan 18 04:39:09 2018 (r328106) +++ head/stand/forth/loader.conf Thu Jan 18 04:58:54 2018 (r328107) @@ -97,7 +97,7 @@ bootenv_autolist="YES" # Auto populate the list of ZF #comconsole_speed="9600" # Set the current serial console speed #console="vidconsole" # A comma separated list of console(s) #currdev="disk1s1a" # Set the current device -module_path="/boot/modules;/boot/dtb" # Set the module search path +module_path="/boot/modules;/boot/dtb;/boot/overlays" # Set the module search path #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem Modified: head/stand/mips/uboot/loader.conf ============================================================================== --- head/stand/mips/uboot/loader.conf Thu Jan 18 04:39:09 2018 (r328106) +++ head/stand/mips/uboot/loader.conf Thu Jan 18 04:58:54 2018 (r328107) @@ -7,7 +7,7 @@ autoboot_delay=10 bootfile="kernel" # Kernel name (possibly absolute path) kernel="kernel" # /boot sub-directory containing kernel and modules loader_conf_files="/boot/loader.conf /boot/loader.conf.local" -module_path="/boot/kernel;/boot/modules;/boot/dtb" +module_path="/boot/kernel;/boot/modules;/boot/dtb;/boot/overlays" nextboot_conf="/boot/nextboot.conf" nextboot_enable="NO" verbose_loading="NO"