svn commit: r325834 - in head: . lib/libefivar release/arm64 release/powerpc release/tools share/examples/bootforth share/examples/etc share/man/man5 share/man/man8 stand stand/efi/boot1 stand/efi/...

Tue Nov 14 23:02:24 UTC 2017

Author: imp
Date: Tue Nov 14 23:02:19 2017
New Revision: 325834
URL: https://svnweb.freebsd.org/changeset/base/325834

Log:
  Move sys/boot to stand. Fix all references to new location
  
  Sponsored by:	Netflix

Added:
  head/stand/
     - copied from r325833, head/sys/boot/
Deleted:
  head/sys/boot/
Modified:
  head/MAINTAINERS
  head/Makefile.inc1
  head/lib/libefivar/Makefile
  head/release/arm64/PINE64.conf
  head/release/arm64/RPI3.conf
  head/release/powerpc/generate-hfs.sh
  head/release/tools/vmimage.subr
  head/share/examples/bootforth/README
  head/share/examples/etc/make.conf
  head/share/man/man5/make.conf.5
  head/share/man/man8/diskless.8
  head/stand/defs.mk
  head/stand/efi/boot1/Makefile.depend
  head/stand/efi/loader/Makefile.depend
  head/stand/forth/pnp.4th
  head/stand/forth/support.4th
  head/stand/i386/Makefile.inc
  head/stand/i386/boot2/Makefile.depend
  head/stand/i386/gptboot/Makefile.depend
  head/stand/i386/gptzfsboot/Makefile.depend
  head/stand/i386/loader/Makefile.depend
  head/stand/i386/pxeldr/Makefile.depend
  head/stand/i386/zfsboot/Makefile.depend
  head/stand/i386/zfsloader/Makefile.depend
  head/stand/userboot/userboot/Makefile.depend
  head/sys/Makefile
  head/sys/contrib/dev/acpica/acpica_prep.sh
  head/targets/pseudo/userland/lib/Makefile.depend
  head/targets/pseudo/userland/misc/Makefile.depend
  head/targets/pseudo/userland/share/Makefile.depend
  head/tools/boot/universe.sh
  head/tools/tools/bootparttest/Makefile
  head/tools/tools/zfsboottest/Makefile
  head/usr.sbin/bhyveload/Makefile
  head/usr.sbin/efivar/Makefile

Modified: head/MAINTAINERS
==============================================================================

--- head/MAINTAINERS	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/MAINTAINERS	Tue Nov 14 23:02:19 2017	(r325834)
@@ -86,7 +86,7 @@ sh(1)		jilles		Pre-commit review requested. This also 
 				compiled in as builtins.
 share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
 share/mk/*.test.mk	freebsd-testing,ngie (same list as share/mk too)	Pre-commit review requested.
-sys/boot/forth		dteske	Pre-commit review requested.
+stand/forth		dteske	Pre-commit review requested.
 sys/compat/linuxkpi	hselasky	If in doubt, ask.
 sys/dev/e1000	erj	Pre-commit phabricator review requested.
 sys/dev/ixgbe	erj	Pre-commit phabricator review requested.

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/Makefile.inc1	Tue Nov 14 23:02:19 2017	(r325834)
@@ -251,6 +251,9 @@ SUBDIR+=secure
 .if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
+.if ${MK_BOOT} != "no"
+SUBDIR+=stand
+.endif
 SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
@@ -2082,7 +2085,7 @@ _clang_libs=	lib/clang
 _gcc=		gnu/usr.bin/cc
 .endif
 .if ${MK_USB} != "no"
-_usb_tools=	sys/boot/usb/tools
+_usb_tools=	stand/usb/tools
 .endif
 
 cross-tools: .MAKE .PHONY

Modified: head/lib/libefivar/Makefile
==============================================================================
--- head/lib/libefivar/Makefile	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/lib/libefivar/Makefile	Tue Nov 14 23:02:19 2017	(r325834)
@@ -26,7 +26,7 @@
 
 .include <src.opts.mk>
 
-EFIBOOT=${SRCTOP}/sys/boot/efi
+EFIBOOT=${SRCTOP}/stand/efi
 EDK2INC=${SRCTOP}/sys/contrib/edk2/Include
 
 .PATH:	${EFIBOOT}/libefi

Modified: head/release/arm64/PINE64.conf
==============================================================================
--- head/release/arm64/PINE64.conf	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/release/arm64/PINE64.conf	Tue Nov 14 23:02:19 2017	(r325834)
@@ -31,7 +31,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT

Modified: head/release/arm64/RPI3.conf
==============================================================================
--- head/release/arm64/RPI3.conf	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/release/arm64/RPI3.conf	Tue Nov 14 23:02:19 2017	(r325834)
@@ -45,7 +45,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT

Modified: head/release/powerpc/generate-hfs.sh
==============================================================================
--- head/release/powerpc/generate-hfs.sh	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/release/powerpc/generate-hfs.sh	Tue Nov 14 23:02:19 2017	(r325834)
@@ -32,7 +32,7 @@ cat > bootinfo.txt << EOF
 <CHRP-BOOT>
 <DESCRIPTION>FreeBSD/powerpc bootloader</DESCRIPTION>
 <OS-NAME>FreeBSD</OS-NAME>
-<VERSION> $FreeBSD: head/sys/boot/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
+<VERSION> $FreeBSD: head/stand/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
 -31 00:52:31Z nwhitehorn $ </VERSION>
 
 <COMPATIBLE>

Modified: head/release/tools/vmimage.subr
==============================================================================
--- head/release/tools/vmimage.subr	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/release/tools/vmimage.subr	Tue Nov 14 23:02:19 2017	(r325834)
@@ -16,7 +16,7 @@ write_partition_layout() {
 
 	BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	case "${TARGET}:${TARGET_ARCH}" in

Modified: head/share/examples/bootforth/README
==============================================================================
--- head/share/examples/bootforth/README	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/share/examples/bootforth/README	Tue Nov 14 23:02:19 2017	(r325834)
@@ -1,6 +1,6 @@
 Here you can find some simple examples how to use BootFORTH (part of the
 new bootloader) together with terminal emulation code (available when
-compiling /sys/boot/i386/libi386 with -DTERM_EMU).
+compiling /stand/i386/libi386 with -DTERM_EMU).
 
 Normally, you can place the files in /boot as they are here, and they will be
 automatically loaded by /boot/loader. You must choose between boot.4th or

Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/share/examples/etc/make.conf	Tue Nov 14 23:02:19 2017	(r325834)
@@ -171,7 +171,7 @@
 #BOOT_COMCONSOLE_SPEED=	115200
 #
 # By default the 'pxeboot' loader retrieves the kernel via NFS.  Defining
-# this and recompiling /usr/src/sys/boot will cause it to retrieve the kernel
+# this and recompiling /usr/src/stand will cause it to retrieve the kernel
 # via TFTP.  This allows pxeboot to load a custom BOOTP diskless kernel yet
 # still mount the server's '/' (i.e. rather than load the server's kernel).
 #

Modified: head/share/man/man5/make.conf.5
==============================================================================
--- head/share/man/man5/make.conf.5	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/share/man/man5/make.conf.5	Tue Nov 14 23:02:19 2017	(r325834)
@@ -374,7 +374,7 @@ By default the
 .Xr pxeboot 8
 loader retrieves the kernel via NFS.
 Defining this and recompiling
-.Pa /usr/src/sys/boot
+.Pa /usr/src/stand
 will cause it to retrieve the kernel via TFTP.
 This allows
 .Xr pxeboot 8
@@ -385,7 +385,7 @@ rather than load the server's kernel.
 .It Va LOADER_FIREWIRE_SUPPORT
 .Pq Vt bool
 Defining this and recompiling
-.Pa /usr/src/sys/boot/i386
+.Pa /usr/src/stand/i386
 will add
 .Xr dcons 4
 console driver to

Modified: head/share/man/man8/diskless.8
==============================================================================
--- head/share/man/man8/diskless.8	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/share/man/man8/diskless.8	Tue Nov 14 23:02:19 2017	(r325834)
@@ -124,7 +124,7 @@ the
 .Nm
 machine, which may not be what you want to have happen.
 .Bd -literal -offset indent
-cd /usr/src/sys/boot/i386
+cd /usr/src/stand/i386
 make clean; make; make install
 cp /boot/pxeboot /tftpdir/
 .Ed

Modified: head/stand/defs.mk
==============================================================================
--- head/sys/boot/defs.mk	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/defs.mk	Tue Nov 14 23:02:19 2017	(r325834)
@@ -5,7 +5,7 @@
 .if !defined(__BOOT_DEFS_MK__)
 __BOOT_DEFS_MK__=${MFILE}
 
-BOOTSRC=	${SRCTOP}/sys/boot
+BOOTSRC=	${SRCTOP}/stand
 EFISRC=		${BOOTSRC}/efi
 EFIINC=		${EFISRC}/include
 EFIINCMD=	${EFIINC}/${MACHINE}
@@ -17,7 +17,7 @@ SYSDIR=		${SRCTOP}/sys
 UBOOTSRC=	${BOOTSRC}/uboot
 ZFSSRC=		${BOOTSRC}/zfs
 
-BOOTOBJ=	${OBJTOP}/sys/boot
+BOOTOBJ=	${OBJTOP}/stand
 
 # BINDIR is where we install
 BINDIR?=	/boot

Modified: head/stand/efi/boot1/Makefile.depend
==============================================================================
--- head/sys/boot/efi/boot1/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/efi/boot1/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -5,9 +5,9 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libmd \
-	sys/boot/efi/libefi \
-	sys/boot/libsa \
-	sys/boot/zfs \
+	stand/efi/libefi \
+	stand/libsa \
+	stand/zfs \
 
 
 .include <dirdeps.mk>

Modified: head/stand/efi/loader/Makefile.depend
==============================================================================
--- head/sys/boot/efi/loader/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/efi/loader/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -4,10 +4,10 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
-	sys/boot/efi/libefi \
-	sys/boot/ficl \
-	sys/boot/libsa \
-	sys/boot/zfs \
+	stand/efi/libefi \
+	stand/ficl \
+	stand/libsa \
+	stand/zfs \
 
 
 .include <dirdeps.mk>

Modified: head/stand/forth/pnp.4th
==============================================================================
--- head/sys/boot/forth/pnp.4th	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/forth/pnp.4th	Tue Nov 14 23:02:19 2017	(r325834)
@@ -45,7 +45,7 @@ structure: pnpident
 	sizeof STAILQ_ENTRY cells member: pnpid.link	\ pnpident
 ;structure
 
-structure: pnpinfo \ sync with sys/boot/config/bootstrap.h
+structure: pnpinfo \ sync with stand/common/bootstrap.h
 	ptr pnpi.desc
 	int pnpi.revision
 	ptr pnpi.module				\ (char*) module args

Modified: head/stand/forth/support.4th
==============================================================================
--- head/sys/boot/forth/support.4th	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/forth/support.4th	Tue Nov 14 23:02:19 2017	(r325834)
@@ -130,7 +130,7 @@ structure: module
 ;structure
 
 \ Internal loader structures (preloaded_file, kernel_module, file_metadata)
-\ must be in sync with the C struct in sys/boot/common/bootstrap.h
+\ must be in sync with the C struct in stand/common/bootstrap.h
 structure: preloaded_file
 	ptr pf.name
 	ptr pf.type

Modified: head/stand/i386/Makefile.inc
==============================================================================
--- head/sys/boot/i386/Makefile.inc	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/Makefile.inc	Tue Nov 14 23:02:19 2017	(r325834)
@@ -1,4 +1,4 @@
-# Common defines for all of /sys/boot/i386/
+# Common defines for all of stand/i386/
 #
 # $FreeBSD$
 

Modified: head/stand/i386/boot2/Makefile.depend
==============================================================================
--- head/sys/boot/i386/boot2/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/boot2/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -3,8 +3,8 @@
 
 DIRDEPS = \
 	include \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
 
 
 .include <dirdeps.mk>

Modified: head/stand/i386/gptboot/Makefile.depend
==============================================================================
--- head/sys/boot/i386/gptboot/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/gptboot/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -5,10 +5,10 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libmd \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
-	sys/boot/libsa32 \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
+	stand/libsa32 \
 
 
 .include <dirdeps.mk>

Modified: head/stand/i386/gptzfsboot/Makefile.depend
==============================================================================
--- head/sys/boot/i386/gptzfsboot/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/gptzfsboot/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -5,11 +5,11 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libmd \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
-	sys/boot/libsa32 \
-	sys/boot/zfs32 \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
+	stand/libsa32 \
+	stand/zfs32 \
 
 
 .include <dirdeps.mk>

Modified: head/stand/i386/loader/Makefile.depend
==============================================================================
--- head/sys/boot/i386/loader/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/loader/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -4,13 +4,13 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
-	sys/boot/ficl32 \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/btx/lib \
-	sys/boot/i386/libi386 \
-	sys/boot/libsa32 \
+	stand/ficl32 \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/btx/lib \
+	stand/i386/libi386 \
+	stand/libsa32 \
 
 
 .include <dirdeps.mk>

Modified: head/stand/i386/pxeldr/Makefile.depend
==============================================================================
--- head/sys/boot/i386/pxeldr/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/pxeldr/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -3,9 +3,9 @@
 
 DIRDEPS = \
 	include \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/loader \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/loader \
 
 
 .include <dirdeps.mk>

Modified: head/stand/i386/zfsboot/Makefile.depend
==============================================================================
--- head/sys/boot/i386/zfsboot/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/zfsboot/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -5,10 +5,10 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libmd \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
-	sys/boot/libsa32 \
-	sys/boot/zfs32 \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
+	stand/libsa32 \
+	stand/zfs32 \
 
 
 .include <dirdeps.mk>

Modified: head/stand/i386/zfsloader/Makefile.depend
==============================================================================
--- head/sys/boot/i386/zfsloader/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/i386/zfsloader/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -4,14 +4,14 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
-	sys/boot/ficl32 \
-	sys/boot/geli \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/btx/lib \
-	sys/boot/i386/libi386 \
-	sys/boot/libsa32 \
-	sys/boot/zfs32 \
+	stand/ficl32 \
+	stand/geli \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/btx/lib \
+	stand/i386/libi386 \
+	stand/libsa32 \
+	stand/zfs32 \
 
 
 .include <dirdeps.mk>

Modified: head/stand/userboot/userboot/Makefile.depend
==============================================================================
--- head/sys/boot/userboot/userboot/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/stand/userboot/userboot/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -4,9 +4,9 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
-	sys/boot/ficl \
-	sys/boot/libsa \
-	sys/boot/zfs \
+	stand/ficl \
+	stand/libsa \
+	stand/zfs \
 
 
 .include <dirdeps.mk>

Modified: head/sys/Makefile
==============================================================================
--- head/sys/Makefile	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/sys/Makefile	Tue Nov 14 23:02:19 2017	(r325834)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 # Directories to include in cscope name file and TAGS.
-CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
+CSCOPEDIRS=	bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 \
 		netgraph netinet netinet6 netipsec netpfil \
 		netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
@@ -61,11 +61,6 @@ TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscope.files
 
 .if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS))
 .include <src.opts.mk>
-
-# The boot loader
-.if ${MK_BOOT} != "no"
-SUBDIR=	boot
-.endif
 
 # Loadable kernel modules
 

Modified: head/sys/contrib/dev/acpica/acpica_prep.sh
==============================================================================
--- head/sys/contrib/dev/acpica/acpica_prep.sh	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/sys/contrib/dev/acpica/acpica_prep.sh	Tue Nov 14 23:02:19 2017	(r325834)
@@ -90,4 +90,4 @@ echo "Directories you may want to 'svn diff':"
 echo "    sys/contrib/dev/acpica sys/dev/acpica \\"
 echo "    sys/amd64/acpica sys/arm64/acpica sys/i386/acpica sys/x86/acpica \\"
 echo "    sys/amd64/include sys/arm64/include sys/i386/include include \\"
-echo "    sys/boot sys/conf sys/modules/acpi usr.sbin/acpi"
+echo "    stand sys/conf sys/modules/acpi usr.sbin/acpi"

Modified: head/targets/pseudo/userland/lib/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/lib/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/targets/pseudo/userland/lib/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -196,7 +196,7 @@ DIRDEPS+= \
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
     ${MACHINE_CPUARCH} == "powerpc"
-DIRDEPS+= sys/boot/libsa32
+DIRDEPS+= stand/libsa32
 .endif
 
 .if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter}

Modified: head/targets/pseudo/userland/misc/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/misc/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/targets/pseudo/userland/misc/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -6,12 +6,12 @@
 .include <src.opts.mk>
 .endif
 
-_sys_boot_efi= sys/boot/efi/loader sys/boot/efi/boot1
+_sys_boot_efi= stand/efi/loader stand/efi/boot1
 .if ${MK_FDT} != "no"
-_sys_boot_fdt= sys/boot/fdt sys/boot/efi/fdt
+_sys_boot_fdt= stand/fdt stand/efi/fdt
 .endif
 .if ${MK_ZFS} != "no"
-_sys_boot_zfs= sys/boot/zfs
+_sys_boot_zfs= stand/zfs
 .endif
 
 DIRDEPS = \
@@ -22,40 +22,40 @@ DIRDEPS = \
 	rescue/rescue \
 
 .if ${MK_BOOT} != "no"
-DIRDEPS+= sys/boot/common
+DIRDEPS+= stand/common
 
 .if ${MK_FORTH} != "no"
 DIRDEPS+= \
-	sys/boot/ficl \
-	sys/boot/forth \
+	stand/ficl \
+	stand/forth \
 
 .endif
 
 DIRDEPS.x86sys= \
-	sys/boot/efi/libefi \
-	sys/boot/geli \
-	sys/boot/i386/boot0 \
-	sys/boot/i386/boot0sio \
-	sys/boot/i386/boot2 \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/btxldr \
-	sys/boot/i386/btx/lib \
-	sys/boot/i386/cdboot \
-	sys/boot/i386/gptboot \
-	sys/boot/i386/libfirewire \
-	sys/boot/i386/libi386 \
-	sys/boot/i386/loader \
-	sys/boot/i386/mbr \
-	sys/boot/i386/pmbr \
-	sys/boot/i386/pxeldr \
-	sys/boot/libsa32 \
+	stand/efi/libefi \
+	stand/geli \
+	stand/i386/boot0 \
+	stand/i386/boot0sio \
+	stand/i386/boot2 \
+	stand/i386/btx/btx \
+	stand/i386/btx/btxldr \
+	stand/i386/btx/lib \
+	stand/i386/cdboot \
+	stand/i386/gptboot \
+	stand/i386/libfirewire \
+	stand/i386/libi386 \
+	stand/i386/loader \
+	stand/i386/mbr \
+	stand/i386/pmbr \
+	stand/i386/pxeldr \
+	stand/libsa32 \
 	${_sys_boot_zfs} \
 
 .if ${MK_ZFS} != "no"
 DIRDEPS.x86sys+= \
-	sys/boot/i386/gptzfsboot \
-	sys/boot/i386/zfsboot \
-	sys/boot/i386/zfsloader \
+	stand/i386/gptzfsboot \
+	stand/i386/zfsboot \
+	stand/i386/zfsloader \
 
 DIRDEPS+= \
 	sbin/zfsbootcfg \
@@ -65,13 +65,13 @@ DIRDEPS+= \
 DIRDEPS.amd64= \
 	${DIRDEPS.x86sys} \
 	${_sys_boot_efi} \
-	sys/boot/ficl32 \
-	sys/boot/userboot/test \
-	sys/boot/userboot/userboot \
+	stand/ficl32 \
+	stand/userboot/test \
+	stand/userboot/userboot \
 
 .if ${MK_ZFS} != "no"
 DIRDEPS.amd64+= \
-	sys/boot/zfs32 \
+	stand/zfs32 \
 
 .endif
 
@@ -83,9 +83,9 @@ DIRDEPS+= \
 
 DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi}
 DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi}
-DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} sys/boot/i386/kgzldr
-DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libsa32 sys/boot/ofw sys/boot/uboot
-DIRDEPS.sparc64= sys/boot/ofw ${_sys_boot_zfs}
+DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} stand/i386/kgzldr
+DIRDEPS.powerpc= ${_sys_boot_fdt} stand/libsa32 stand/ofw stand/uboot
+DIRDEPS.sparc64= stand/ofw ${_sys_boot_zfs}
 .endif
 
 DIRDEPS+= ${DIRDEPS.${MACHINE}:U}

Modified: head/targets/pseudo/userland/share/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/share/Makefile.depend	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/targets/pseudo/userland/share/Makefile.depend	Tue Nov 14 23:02:19 2017	(r325834)
@@ -91,7 +91,7 @@ DIRDEPS = \
 	share/xml/atf \
 	share/xsl/atf \
 	share/zoneinfo \
-	sys/boot/man \
+	stand/man \
 
 
 .include <dirdeps.mk>

Modified: head/tools/boot/universe.sh
==============================================================================
--- head/tools/boot/universe.sh	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/tools/boot/universe.sh	Tue Nov 14 23:02:19 2017	(r325834)
@@ -11,8 +11,8 @@
 #	powerpc/powerpc powerpc/powerpc64 powerpc/powerpcspe \
 #	riscv/riscv64 riscv/riscv64sf
 #
-# This script is expected to be run in sys/boot (though you could run it anywhere
-# in the tree). It does a full clean build. For sys/boot you can do all the archs in
+# This script is expected to be run in stand (though you could run it anywhere
+# in the tree). It does a full clean build. For stand you can do all the archs in
 # about a minute or two on a fast machine. It's also possible that you need a full
 # make universe for this to work completely.
 #
@@ -40,7 +40,7 @@ dobuild()
 }
 
 top=$(make -V SRCTOP)
-cd $top/sys/boot
+cd $top/stand
 
 # Default build for a goodly selection of architectures
 for i in \

Modified: head/tools/tools/bootparttest/Makefile
==============================================================================
--- head/tools/tools/bootparttest/Makefile	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/tools/tools/bootparttest/Makefile	Tue Nov 14 23:02:19 2017	(r325834)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${SRCTOP}/sys/boot/common
+.PATH:		${SRCTOP}/stand/common
 
 BINDIR?=	/usr/bin
 
@@ -9,7 +9,7 @@ MAN=
 
 SRCS=		bootparttest.c crc32.c stub.c part.c disk.c
 
-CFLAGS=		-I${SRCTOP}/sys/boot/common \
+CFLAGS=		-I${SRCTOP}/stand/common \
 		-DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT -DPART_DEBUG \
 		-DDISK_DEBUG
 

Modified: head/tools/tools/zfsboottest/Makefile
==============================================================================
--- head/tools/tools/zfsboottest/Makefile	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/tools/tools/zfsboottest/Makefile	Tue Nov 14 23:02:19 2017	(r325834)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${SRCTOP}/sys/boot/zfs ${SRCTOP}/sys/cddl/boot/zfs
+.PATH:		${SRCTOP}/stand/zfs ${SRCTOP}/sys/cddl/boot/zfs
 
 BINDIR?=	/usr/bin
 SCRIPTSDIR?=	/usr/bin
@@ -11,7 +11,7 @@ SCRIPTSNAME=	zfsboottest.sh
 MAN=
 
 CFLAGS=	-O1 \
-	-I${SRCTOP}/sys/boot/zfs \
+	-I${SRCTOP}/stand/zfs \
 	-I${SRCTOP}/sys/cddl/boot/zfs \
 	-I. \
 	-fdiagnostics-show-option \

Modified: head/usr.sbin/bhyveload/Makefile
==============================================================================
--- head/usr.sbin/bhyveload/Makefile	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/usr.sbin/bhyveload/Makefile	Tue Nov 14 23:02:19 2017	(r325834)
@@ -9,6 +9,6 @@ LIBADD=	vmmapi
 
 WARNS?=	3
 
-CFLAGS+=-I${SRCTOP}/sys/boot/userboot
+CFLAGS+=-I${SRCTOP}/stand/userboot
 
 .include <bsd.prog.mk>

Modified: head/usr.sbin/efivar/Makefile
==============================================================================
--- head/usr.sbin/efivar/Makefile	Tue Nov 14 22:30:48 2017	(r325833)
+++ head/usr.sbin/efivar/Makefile	Tue Nov 14 23:02:19 2017	(r325834)
@@ -7,7 +7,7 @@ LIBADD= efivar
 
 SRCS=	efivar.c efiutil.c
 
-EFIBOOT=${SRCTOP}/sys/boot/efi
+EFIBOOT=${SRCTOP}/stand/efi
 CFLAGS+=	-I${EFIBOOT}/include
 
 .include <bsd.prog.mk>
