svn commit: r328499 - in stable/11: etc/mtree share/man/man7 sys/boot/arm/uboot sys/boot/mips/uboot

[Kyle Evans]

Author: kevans
Date: Sat Jan 27 23:13:34 2018
New Revision: 328499
URL: https://svnweb.freebsd.org/changeset/base/328499

Log:
  MFC (conceptually) r328107: Add /boot/overlays
  
  This is a direct commit to stable/11, due to path changes in HEAD. Diffs
  have been applied on top of stable/11, with exception to the change to
  forth/loader.conf. forth/loader.conf has seen additional changes in HEAD
  mthat are not being MFC'd to stable/11, so the addition of /boot/overlays to
  its module_path is not necessary.
  
  MFC r328107: stand: Add /boot/overlays for separation of overlays from DTB
  
  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).

Modified:
  stable/11/etc/mtree/BSD.root.dist
  stable/11/share/man/man7/hier.7
  stable/11/sys/boot/arm/uboot/loader.conf
  stable/11/sys/boot/mips/uboot/loader.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/mtree/BSD.root.dist
==============================================================================
--- stable/11/etc/mtree/BSD.root.dist	Sat Jan 27 22:57:06 2018	(r328498)
+++ stable/11/etc/mtree/BSD.root.dist	Sat Jan 27 23:13:34 2018	(r328499)
@@ -18,6 +18,8 @@
         ..
         modules
         ..
+        overlays
+        ..
         zfs
         ..
     ..

Modified: stable/11/share/man/man7/hier.7
==============================================================================
--- stable/11/share/man/man7/hier.7	Sat Jan 27 22:57:06 2018	(r328498)
+++ stable/11/share/man/man7/hier.7	Sat Jan 27 23:13:34 2018	(r328499)
@@ -28,7 +28,7 @@
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd April 6, 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: stable/11/sys/boot/arm/uboot/loader.conf
==============================================================================
--- stable/11/sys/boot/arm/uboot/loader.conf	Sat Jan 27 22:57:06 2018	(r328498)
+++ stable/11/sys/boot/arm/uboot/loader.conf	Sat Jan 27 23:13:34 2018	(r328499)
@@ -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: stable/11/sys/boot/mips/uboot/loader.conf
==============================================================================
--- stable/11/sys/boot/mips/uboot/loader.conf	Sat Jan 27 22:57:06 2018	(r328498)
+++ stable/11/sys/boot/mips/uboot/loader.conf	Sat Jan 27 23:13:34 2018	(r328499)
@@ -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"