744 files changed, 36 insertions, 34 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4b2cd3f..4b63e0b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -87,7 +87,7 @@ sh(1)		jilles		Pre-commit review requested. This also applies
 				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.
diff --git a/Makefile.inc1 b/Makefile.inc1
index 0aa8658..c4fd04c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -252,6 +252,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
@@ -1903,7 +1906,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
diff --git a/README b/README
index a097ddf..b7c62b1 100644
--- a/README
+++ b/README
@@ -66,6 +66,8 @@ secure		Cryptographic libraries and commands.
 
 share		Shared resources.
 
+stand		Boot loader sources.
+
 sys		Kernel sources.
 
 tests		Regression tests which can be run by Kyua.  See tests/README
diff --git a/lib/libefivar/Makefile b/lib/libefivar/Makefile
index b4368ce..66dd52c 100644
--- a/lib/libefivar/Makefile
+++ b/lib/libefivar/Makefile
@@ -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
diff --git a/release/powerpc/generate-hfs.sh b/release/powerpc/generate-hfs.sh
index c445fea..8883f9d 100755
--- a/release/powerpc/generate-hfs.sh
+++ b/release/powerpc/generate-hfs.sh
@@ -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>
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 6ba7e18..692a5a4 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -17,9 +17,9 @@ write_partition_layout() {
 	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"
 	_OBJDIR="$(realpath ${_OBJDIR})"
 	if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then
-		BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
+		BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/stand"
 	else
-		BOOTFILES="/${_OBJDIR}/sys/boot"
+		BOOTFILES="/${_OBJDIR}/stand"
 	fi
 
 	case "${TARGET}:${TARGET_ARCH}" in
diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README
index b8eb8a0..1ac1342 100644
--- a/share/examples/bootforth/README
+++ b/share/examples/bootforth/README
@@ -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
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 7dbfc51..e191037 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -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).
 #
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 24ebffb..9887072 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -369,7 +369,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
@@ -380,7 +380,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
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 73b9795..78ca429 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -28,7 +28,7 @@
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd January 15, 2018
+.Dd February 11, 2018
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -696,6 +696,8 @@ build directory for files in
 .It Pa share/
 source for files in
 .Pa /usr/share
+.It Pa stand/
+boot loader source code
 .It Pa sys/
 kernel source code
 .Bl -tag -width "opencrypto/" -compact
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 3fcbc25..668ba21 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -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
diff --git a/sys/boot/Makefile b/stand/Makefile
index 5234189..5234189 100644
--- a/sys/boot/Makefile
+++ b/stand/Makefile
diff --git a/sys/boot/Makefile.amd64 b/stand/Makefile.amd64
index abecaa6..abecaa6 100644
--- a/sys/boot/Makefile.amd64
+++ b/stand/Makefile.amd64
diff --git a/sys/boot/Makefile.arm b/stand/Makefile.arm
index 387b77b..387b77b 100644
--- a/sys/boot/Makefile.arm
+++ b/stand/Makefile.arm
diff --git a/sys/boot/Makefile.arm64 b/stand/Makefile.arm64
index bf0fd39..bf0fd39 100644
--- a/sys/boot/Makefile.arm64
+++ b/stand/Makefile.arm64
diff --git a/sys/boot/Makefile.i386 b/stand/Makefile.i386
index fb53744..fb53744 100644
--- a/sys/boot/Makefile.i386
+++ b/stand/Makefile.i386
diff --git a/sys/boot/Makefile.inc b/stand/Makefile.inc
index cf833d9..cf833d9 100644
--- a/sys/boot/Makefile.inc
+++ b/stand/Makefile.inc
diff --git a/sys/boot/Makefile.mips b/stand/Makefile.mips
index 46fc574..46fc574 100644
--- a/sys/boot/Makefile.mips
+++ b/stand/Makefile.mips
diff --git a/sys/boot/Makefile.pc98 b/stand/Makefile.pc98
index 8468399..8468399 100644
--- a/sys/boot/Makefile.pc98
+++ b/stand/Makefile.pc98
diff --git a/sys/boot/Makefile.powerpc b/stand/Makefile.powerpc
index b7660f4..b7660f4 100644
--- a/sys/boot/Makefile.powerpc
+++ b/stand/Makefile.powerpc
diff --git a/sys/boot/Makefile.sparc64 b/stand/Makefile.sparc64
index 40b42e9..40b42e9 100644
--- a/sys/boot/Makefile.sparc64
+++ b/stand/Makefile.sparc64
diff --git a/sys/boot/arm/Makefile b/stand/arm/Makefile
index 1d12d98..1d12d98 100644
--- a/sys/boot/arm/Makefile
+++ b/stand/arm/Makefile
diff --git a/sys/boot/arm/Makefile.inc b/stand/arm/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/arm/Makefile.inc
+++ b/stand/arm/Makefile.inc
diff --git a/sys/boot/arm/loader/loader.conf b/stand/arm/loader/loader.conf
index dd2a23a..dd2a23a 100644
--- a/sys/boot/arm/loader/loader.conf
+++ b/stand/arm/loader/loader.conf
diff --git a/sys/boot/arm/uboot/Makefile b/stand/arm/uboot/Makefile
index 5bf7d53..5bf7d53 100644
--- a/sys/boot/arm/uboot/Makefile
+++ b/stand/arm/uboot/Makefile
diff --git a/sys/boot/arm/uboot/conf.c b/stand/arm/uboot/conf.c
index 777a7b2..777a7b2 100644
--- a/sys/boot/arm/uboot/conf.c
+++ b/stand/arm/uboot/conf.c
diff --git a/sys/boot/arm/uboot/help.uboot b/stand/arm/uboot/help.uboot
index c1574af..c1574af 100644
--- a/sys/boot/arm/uboot/help.uboot
+++ b/stand/arm/uboot/help.uboot
diff --git a/sys/boot/arm/uboot/ldscript.arm b/stand/arm/uboot/ldscript.arm
index 8eb604c..8eb604c 100644
--- a/sys/boot/arm/uboot/ldscript.arm
+++ b/stand/arm/uboot/ldscript.arm
diff --git a/sys/boot/arm/uboot/start.S b/stand/arm/uboot/start.S
index ede6a62..ede6a62 100644
--- a/sys/boot/arm/uboot/start.S
+++ b/stand/arm/uboot/start.S
diff --git a/sys/boot/arm/uboot/version b/stand/arm/uboot/version
index 486c412..486c412 100644
--- a/sys/boot/arm/uboot/version
+++ b/stand/arm/uboot/version
diff --git a/sys/boot/arm64/Makefile b/stand/arm64/Makefile
index 3ecb582..3ecb582 100644
--- a/sys/boot/arm64/Makefile
+++ b/stand/arm64/Makefile
diff --git a/sys/boot/arm64/libarm64/cache.c b/stand/arm64/libarm64/cache.c
index 25766ef..25766ef 100644
--- a/sys/boot/arm64/libarm64/cache.c
+++ b/stand/arm64/libarm64/cache.c
diff --git a/sys/boot/arm64/libarm64/cache.h b/stand/arm64/libarm64/cache.h
index 89b094b..89b094b 100644
--- a/sys/boot/arm64/libarm64/cache.h
+++ b/stand/arm64/libarm64/cache.h
diff --git a/sys/boot/common/Makefile.depend b/stand/common/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/common/Makefile.depend
+++ b/stand/common/Makefile.depend
diff --git a/sys/boot/common/bcache.c b/stand/common/bcache.c
index 198dd5f..198dd5f 100644
--- a/sys/boot/common/bcache.c
+++ b/stand/common/bcache.c
diff --git a/sys/boot/common/boot.c b/stand/common/boot.c
index 5ee9521..5ee9521 100644
--- a/sys/boot/common/boot.c
+++ b/stand/common/boot.c
diff --git a/sys/boot/common/bootstrap.h b/stand/common/bootstrap.h
index 2234e05..2234e05 100644
--- a/sys/boot/common/bootstrap.h
+++ b/stand/common/bootstrap.h
diff --git a/sys/boot/common/commands.c b/stand/common/commands.c
index def7ff2..def7ff2 100644
--- a/sys/boot/common/commands.c
+++ b/stand/common/commands.c
diff --git a/sys/boot/common/console.c b/stand/common/console.c
index f4ffc56..f4ffc56 100644
--- a/sys/boot/common/console.c
+++ b/stand/common/console.c
diff --git a/sys/boot/common/dev_net.c b/stand/common/dev_net.c
index c5b1e0a..c5b1e0a 100644
--- a/sys/boot/common/dev_net.c
+++ b/stand/common/dev_net.c
diff --git a/sys/boot/common/dev_net.h b/stand/common/dev_net.h
index 995b672..995b672 100644
--- a/sys/boot/common/dev_net.h
+++ b/stand/common/dev_net.h
diff --git a/sys/boot/common/devopen.c b/stand/common/devopen.c
index de6165c..de6165c 100644
--- a/sys/boot/common/devopen.c
+++ b/stand/common/devopen.c
diff --git a/sys/boot/common/disk.c b/stand/common/disk.c
index 4cb57d4..4cb57d4 100644
--- a/sys/boot/common/disk.c
+++ b/stand/common/disk.c
diff --git a/sys/boot/common/disk.h b/stand/common/disk.h
index 51e1498..51e1498 100644
--- a/sys/boot/common/disk.h
+++ b/stand/common/disk.h
diff --git a/sys/boot/common/help.common b/stand/common/help.common
index 3618501..3618501 100644
--- a/sys/boot/common/help.common
+++ b/stand/common/help.common
diff --git a/sys/boot/common/install.c b/stand/common/install.c
index 8c19066..8c19066 100644
--- a/sys/boot/common/install.c
+++ b/stand/common/install.c
diff --git a/sys/boot/common/interp.c b/stand/common/interp.c
index f4117b9..f4117b9 100644
--- a/sys/boot/common/interp.c
+++ b/stand/common/interp.c
diff --git a/sys/boot/common/interp_backslash.c b/stand/common/interp_backslash.c
index 09b8f57..09b8f57 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/stand/common/interp_backslash.c
diff --git a/sys/boot/common/interp_forth.c b/stand/common/interp_forth.c
index a3b7776..a3b7776 100644
--- a/sys/boot/common/interp_forth.c
+++ b/stand/common/interp_forth.c
diff --git a/sys/boot/common/interp_parse.c b/stand/common/interp_parse.c
index 8d8a2e2..8d8a2e2 100644
--- a/sys/boot/common/interp_parse.c
+++ b/stand/common/interp_parse.c
diff --git a/sys/boot/common/isapnp.c b/stand/common/isapnp.c
index 5867600..5867600 100644
--- a/sys/boot/common/isapnp.c
+++ b/stand/common/isapnp.c
diff --git a/sys/boot/common/isapnp.h b/stand/common/isapnp.h
index 0f9956c..0f9956c 100644
--- a/sys/boot/common/isapnp.h
+++ b/stand/common/isapnp.h
diff --git a/sys/boot/common/load_elf.c b/stand/common/load_elf.c
index 679842b..679842b 100644
--- a/sys/boot/common/load_elf.c
+++ b/stand/common/load_elf.c
diff --git a/sys/boot/common/load_elf32.c b/stand/common/load_elf32.c
index 0c9f460..0c9f460 100644
--- a/sys/boot/common/load_elf32.c
+++ b/stand/common/load_elf32.c
diff --git a/sys/boot/common/load_elf32_obj.c b/stand/common/load_elf32_obj.c
index 94b0896..94b0896 100644
--- a/sys/boot/common/load_elf32_obj.c
+++ b/stand/common/load_elf32_obj.c
diff --git a/sys/boot/common/load_elf64.c b/stand/common/load_elf64.c
index c29e8e3..c29e8e3 100644
--- a/sys/boot/common/load_elf64.c
+++ b/stand/common/load_elf64.c
diff --git a/sys/boot/common/load_elf64_obj.c b/stand/common/load_elf64_obj.c
index 3c9371b..3c9371b 100644
--- a/sys/boot/common/load_elf64_obj.c
+++ b/stand/common/load_elf64_obj.c
diff --git a/sys/boot/common/load_elf_obj.c b/stand/common/load_elf_obj.c
index a32b9fd..a32b9fd 100644
--- a/sys/boot/common/load_elf_obj.c
+++ b/stand/common/load_elf_obj.c
diff --git a/sys/boot/common/ls.c b/stand/common/ls.c
index cd6b7c4..cd6b7c4 100644
--- a/sys/boot/common/ls.c
+++ b/stand/common/ls.c
diff --git a/sys/boot/common/md.c b/stand/common/md.c
index 5585218..5585218 100644
--- a/sys/boot/common/md.c
+++ b/stand/common/md.c
diff --git a/sys/boot/common/merge_help.awk b/stand/common/merge_help.awk
index 1070f73..1070f73 100644
--- a/sys/boot/common/merge_help.awk
+++ b/stand/common/merge_help.awk
diff --git a/sys/boot/common/misc.c b/stand/common/misc.c
index 9b938af..9b938af 100644
--- a/sys/boot/common/misc.c
+++ b/stand/common/misc.c
diff --git a/sys/boot/common/module.c b/stand/common/module.c
index d651ad1..d651ad1 100644
--- a/sys/boot/common/module.c
+++ b/stand/common/module.c
diff --git a/sys/boot/common/newvers.sh b/stand/common/newvers.sh
index 75efece..75efece 100755
--- a/sys/boot/common/newvers.sh
+++ b/stand/common/newvers.sh
diff --git a/sys/boot/common/part.c b/stand/common/part.c
index cdb1e00..cdb1e00 100644
--- a/sys/boot/common/part.c
+++ b/stand/common/part.c
diff --git a/sys/boot/common/part.h b/stand/common/part.h
index 19bd670..19bd670 100644
--- a/sys/boot/common/part.h
+++ b/stand/common/part.h
diff --git a/sys/boot/common/paths.h b/stand/common/paths.h
index 9ed45e6..9ed45e6 100644
--- a/sys/boot/common/paths.h
+++ b/stand/common/paths.h
diff --git a/sys/boot/common/pnp.c b/stand/common/pnp.c
index 6197776..6197776 100644
--- a/sys/boot/common/pnp.c
+++ b/stand/common/pnp.c
diff --git a/sys/boot/common/rbx.h b/stand/common/rbx.h
index 21371a5..21371a5 100644
--- a/sys/boot/common/rbx.h
+++ b/stand/common/rbx.h
diff --git a/sys/boot/common/reloc_elf.c b/stand/common/reloc_elf.c
index aa3b0f7..aa3b0f7 100644
--- a/sys/boot/common/reloc_elf.c
+++ b/stand/common/reloc_elf.c
diff --git a/sys/boot/common/reloc_elf32.c b/stand/common/reloc_elf32.c
index 03d9d73..03d9d73 100644
--- a/sys/boot/common/reloc_elf32.c
+++ b/stand/common/reloc_elf32.c
diff --git a/sys/boot/common/reloc_elf64.c b/stand/common/reloc_elf64.c
index c8dcf2a..c8dcf2a 100644
--- a/sys/boot/common/reloc_elf64.c
+++ b/stand/common/reloc_elf64.c
diff --git a/sys/boot/common/self_reloc.c b/stand/common/self_reloc.c
index 5f6bfcb..5f6bfcb 100644
--- a/sys/boot/common/self_reloc.c
+++ b/stand/common/self_reloc.c
diff --git a/sys/boot/defs.mk b/stand/defs.mk
index 2753e21..20e9a77 100644
--- a/sys/boot/defs.mk
+++ b/stand/defs.mk
@@ -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
diff --git a/sys/boot/efi/Makefile b/stand/efi/Makefile
index e3b22de..e3b22de 100644
--- a/sys/boot/efi/Makefile
+++ b/stand/efi/Makefile
diff --git a/sys/boot/efi/Makefile.inc b/stand/efi/Makefile.inc
index 4fd8762..4fd8762 100644
--- a/sys/boot/efi/Makefile.inc
+++ b/stand/efi/Makefile.inc
diff --git a/sys/boot/efi/boot1/Makefile b/stand/efi/boot1/Makefile
index f2e6946..f2e6946 100644
--- a/sys/boot/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
diff --git a/sys/boot/efi/boot1/Makefile.depend b/stand/efi/boot1/Makefile.depend
index 2984414..2984414 100644
--- a/sys/boot/efi/boot1/Makefile.depend
+++ b/stand/efi/boot1/Makefile.depend
diff --git a/sys/boot/efi/boot1/Makefile.fat b/stand/efi/boot1/Makefile.fat
index 1d40fa8..1d40fa8 100644
--- a/sys/boot/efi/boot1/Makefile.fat
+++ b/stand/efi/boot1/Makefile.fat
diff --git a/sys/boot/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c
index b7cb57f..b7cb57f 100644
--- a/sys/boot/efi/boot1/boot1.c
+++ b/stand/efi/boot1/boot1.c
diff --git a/sys/boot/efi/boot1/boot_module.h b/stand/efi/boot1/boot_module.h
index bfade34..bfade34 100644
--- a/sys/boot/efi/boot1/boot_module.h
+++ b/stand/efi/boot1/boot_module.h
diff --git a/sys/boot/efi/boot1/fat-amd64.tmpl.xz b/stand/efi/boot1/fat-amd64.tmpl.xz
index fb5f94e..fb5f94e 100644
--- a/sys/boot/efi/boot1/fat-amd64.tmpl.xz
+++ b/stand/efi/boot1/fat-amd64.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-arm.tmpl.xz b/stand/efi/boot1/fat-arm.tmpl.xz
index bb253fc..bb253fc 100644
--- a/sys/boot/efi/boot1/fat-arm.tmpl.xz
+++ b/stand/efi/boot1/fat-arm.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-arm64.tmpl.xz b/stand/efi/boot1/fat-arm64.tmpl.xz
index 15df643..15df643 100644
--- a/sys/boot/efi/boot1/fat-arm64.tmpl.xz
+++ b/stand/efi/boot1/fat-arm64.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-i386.tmpl.xz b/stand/efi/boot1/fat-i386.tmpl.xz
index 2cde337..2cde337 100644
--- a/sys/boot/efi/boot1/fat-i386.tmpl.xz
+++ b/stand/efi/boot1/fat-i386.tmpl.xz
diff --git a/sys/boot/efi/boot1/generate-fat.sh b/stand/efi/boot1/generate-fat.sh
index f6bda6f..f6bda6f 100755
--- a/sys/boot/efi/boot1/generate-fat.sh
+++ b/stand/efi/boot1/generate-fat.sh
diff --git a/sys/boot/efi/boot1/ufs_module.c b/stand/efi/boot1/ufs_module.c
index 4a8016f..4a8016f 100644
--- a/sys/boot/efi/boot1/ufs_module.c
+++ b/stand/efi/boot1/ufs_module.c
diff --git a/sys/boot/efi/boot1/zfs_module.c b/stand/efi/boot1/zfs_module.c
index e1d1a5a..e1d1a5a 100644
--- a/sys/boot/efi/boot1/zfs_module.c
+++ b/stand/efi/boot1/zfs_module.c
diff --git a/sys/boot/efi/fdt/Makefile b/stand/efi/fdt/Makefile
index 7308ce9..7308ce9 100644
--- a/sys/boot/efi/fdt/Makefile
+++ b/stand/efi/fdt/Makefile
diff --git a/sys/boot/efi/fdt/Makefile.depend b/stand/efi/fdt/Makefile.depend
index 18be76b..18be76b 100644
--- a/sys/boot/efi/fdt/Makefile.depend
+++ b/stand/efi/fdt/Makefile.depend
diff --git a/sys/boot/efi/fdt/efi_fdt.c b/stand/efi/fdt/efi_fdt.c
index 8703aed..8703aed 100644
--- a/sys/boot/efi/fdt/efi_fdt.c
+++ b/stand/efi/fdt/efi_fdt.c
diff --git a/sys/boot/efi/include/README b/stand/efi/include/README
index bf821fa..bf821fa 100644
--- a/sys/boot/efi/include/README
+++ b/stand/efi/include/README
diff --git a/sys/boot/efi/include/amd64/efibind.h b/stand/efi/include/amd64/efibind.h
index 8cfce5b..8cfce5b 100644
--- a/sys/boot/efi/include/amd64/efibind.h
+++ b/stand/efi/include/amd64/efibind.h
diff --git a/sys/boot/efi/include/amd64/pe.h b/stand/efi/include/amd64/pe.h
index f8033c5..f8033c5 100644
--- a/sys/boot/efi/include/amd64/pe.h
+++ b/stand/efi/include/amd64/pe.h
diff --git a/sys/boot/efi/include/arm/efibind.h b/stand/efi/include/arm/efibind.h
index 177032a..177032a 100644
--- a/sys/boot/efi/include/arm/efibind.h
+++ b/stand/efi/include/arm/efibind.h
diff --git a/sys/boot/efi/include/arm64/efibind.h b/stand/efi/include/arm64/efibind.h
index 4751e2e..4751e2e 100644
--- a/sys/boot/efi/include/arm64/efibind.h
+++ b/stand/efi/include/arm64/efibind.h
diff --git a/sys/boot/efi/include/efi.h b/stand/efi/include/efi.h
index a91e881..a91e881 100644
--- a/sys/boot/efi/include/efi.h
+++ b/stand/efi/include/efi.h
diff --git a/sys/boot/efi/include/efi_driver_utils.h b/stand/efi/include/efi_driver_utils.h
index 520cff1..520cff1 100644
--- a/sys/boot/efi/include/efi_driver_utils.h
+++ b/stand/efi/include/efi_driver_utils.h
diff --git a/sys/boot/efi/include/efi_drivers.h b/stand/efi/include/efi_drivers.h
index 8df9133..8df9133 100644
--- a/sys/boot/efi/include/efi_drivers.h
+++ b/stand/efi/include/efi_drivers.h
diff --git a/sys/boot/efi/include/efi_nii.h b/stand/efi/include/efi_nii.h
index 561cbd4..561cbd4 100644
--- a/sys/boot/efi/include/efi_nii.h
+++ b/stand/efi/include/efi_nii.h
diff --git a/sys/boot/efi/include/efiapi.h b/stand/efi/include/efiapi.h
index 8bab217..8bab217 100644
--- a/sys/boot/efi/include/efiapi.h
+++ b/stand/efi/include/efiapi.h
diff --git a/sys/boot/efi/include/efichar.h b/stand/efi/include/efichar.h
index 2fa4ed4..2fa4ed4 100644
--- a/sys/boot/efi/include/efichar.h
+++ b/stand/efi/include/efichar.h
diff --git a/sys/boot/efi/include/eficon.h b/stand/efi/include/eficon.h
index 2f719e7..2f719e7 100644
--- a/sys/boot/efi/include/eficon.h
+++ b/stand/efi/include/eficon.h
diff --git a/sys/boot/efi/include/eficonsctl.h b/stand/efi/include/eficonsctl.h
index 68be3d6..68be3d6 100644
--- a/sys/boot/efi/include/eficonsctl.h
+++ b/stand/efi/include/eficonsctl.h
diff --git a/sys/boot/efi/include/efidebug.h b/stand/efi/include/efidebug.h
index 5576d5f..5576d5f 100644
--- a/sys/boot/efi/include/efidebug.h
+++ b/stand/efi/include/efidebug.h
diff --git a/sys/boot/efi/include/efidef.h b/stand/efi/include/efidef.h
index 9cc5cdc..9cc5cdc 100644
--- a/sys/boot/efi/include/efidef.h
+++ b/stand/efi/include/efidef.h
diff --git a/sys/boot/efi/include/efidevp.h b/stand/efi/include/efidevp.h
index cda6b41..cda6b41 100644
--- a/sys/boot/efi/include/efidevp.h
+++ b/stand/efi/include/efidevp.h
diff --git a/sys/boot/efi/include/efierr.h b/stand/efi/include/efierr.h
index a8b6557..a8b6557 100644
--- a/sys/boot/efi/include/efierr.h
+++ b/stand/efi/include/efierr.h
diff --git a/sys/boot/efi/include/efifpswa.h b/stand/efi/include/efifpswa.h
index 21823c5..21823c5 100644
--- a/sys/boot/efi/include/efifpswa.h
+++ b/stand/efi/include/efifpswa.h
diff --git a/sys/boot/efi/include/efifs.h b/stand/efi/include/efifs.h
index 58febb6..58febb6 100644
--- a/sys/boot/efi/include/efifs.h
+++ b/stand/efi/include/efifs.h
diff --git a/sys/boot/efi/include/efigop.h b/stand/efi/include/efigop.h
index 104fa6e..104fa6e 100644
--- a/sys/boot/efi/include/efigop.h
+++ b/stand/efi/include/efigop.h
diff --git a/sys/boot/efi/include/efilib.h b/stand/efi/include/efilib.h
index 8721bc5..8721bc5 100644
--- a/sys/boot/efi/include/efilib.h
+++ b/stand/efi/include/efilib.h
diff --git a/sys/boot/efi/include/efinet.h b/stand/efi/include/efinet.h
index 3ac58b2..3ac58b2 100644
--- a/sys/boot/efi/include/efinet.h
+++ b/stand/efi/include/efinet.h
diff --git a/sys/boot/efi/include/efipart.h b/stand/efi/include/efipart.h
index ef1a870..ef1a870 100644
--- a/sys/boot/efi/include/efipart.h
+++ b/stand/efi/include/efipart.h
diff --git a/sys/boot/efi/include/efipciio.h b/stand/efi/include/efipciio.h
index b00d6ec..b00d6ec 100644
--- a/sys/boot/efi/include/efipciio.h
+++ b/stand/efi/include/efipciio.h
diff --git a/sys/boot/efi/include/efiprot.h b/stand/efi/include/efiprot.h
index 351b2d3..351b2d3 100644
--- a/sys/boot/efi/include/efiprot.h
+++ b/stand/efi/include/efiprot.h
diff --git a/sys/boot/efi/include/efipxebc.h b/stand/efi/include/efipxebc.h
index ba0b2e9..ba0b2e9 100644
--- a/sys/boot/efi/include/efipxebc.h
+++ b/stand/efi/include/efipxebc.h
diff --git a/sys/boot/efi/include/efiser.h b/stand/efi/include/efiser.h
index e3d66e2..e3d66e2 100644
--- a/sys/boot/efi/include/efiser.h
+++ b/stand/efi/include/efiser.h
diff --git a/sys/boot/efi/include/efistdarg.h b/stand/efi/include/efistdarg.h
index 25f5569..25f5569 100644
--- a/sys/boot/efi/include/efistdarg.h
+++ b/stand/efi/include/efistdarg.h
diff --git a/sys/boot/efi/include/efiuga.h b/stand/efi/include/efiuga.h
index 28c738e..28c738e 100644
--- a/sys/boot/efi/include/efiuga.h
+++ b/stand/efi/include/efiuga.h
diff --git a/sys/boot/efi/include/efizfs.h b/stand/efi/include/efizfs.h
index 1fd034f..1fd034f 100644
--- a/sys/boot/efi/include/efizfs.h
+++ b/stand/efi/include/efizfs.h
diff --git a/sys/boot/efi/include/i386/efibind.h b/stand/efi/include/i386/efibind.h
index 0f1d4f1..0f1d4f1 100644
--- a/sys/boot/efi/include/i386/efibind.h
+++ b/stand/efi/include/i386/efibind.h
diff --git a/sys/boot/efi/include/i386/pe.h b/stand/efi/include/i386/pe.h
index e2ae25c..e2ae25c 100644
--- a/sys/boot/efi/include/i386/pe.h
+++ b/stand/efi/include/i386/pe.h
diff --git a/sys/boot/efi/libefi/Makefile b/stand/efi/libefi/Makefile
index e0ffd7b..e0ffd7b 100644
--- a/sys/boot/efi/libefi/Makefile
+++ b/stand/efi/libefi/Makefile
diff --git a/sys/boot/efi/libefi/Makefile.depend b/stand/efi/libefi/Makefile.depend
index 18be76b..18be76b 100644
--- a/sys/boot/efi/libefi/Makefile.depend
+++ b/stand/efi/libefi/Makefile.depend
diff --git a/sys/boot/efi/libefi/delay.c b/stand/efi/libefi/delay.c
index 723f681..723f681 100644
--- a/sys/boot/efi/libefi/delay.c
+++ b/stand/efi/libefi/delay.c
diff --git a/sys/boot/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c
index 52e4799..52e4799 100644
--- a/sys/boot/efi/libefi/devicename.c
+++ b/stand/efi/libefi/devicename.c
diff --git a/sys/boot/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c
index f881cfc..f881cfc 100644
--- a/sys/boot/efi/libefi/devpath.c
+++ b/stand/efi/libefi/devpath.c
diff --git a/sys/boot/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c
index 450ed46..450ed46 100644
--- a/sys/boot/efi/libefi/efi_console.c
+++ b/stand/efi/libefi/efi_console.c
diff --git a/sys/boot/efi/libefi/efi_driver_utils.c b/stand/efi/libefi/efi_driver_utils.c
index 0edea5c..0edea5c 100644
--- a/sys/boot/efi/libefi/efi_driver_utils.c
+++ b/stand/efi/libefi/efi_driver_utils.c
diff --git a/sys/boot/efi/libefi/efichar.c b/stand/efi/libefi/efichar.c
index dad4e96..dad4e96 100644
--- a/sys/boot/efi/libefi/efichar.c
+++ b/stand/efi/libefi/efichar.c
diff --git a/sys/boot/efi/libefi/efinet.c b/stand/efi/libefi/efinet.c
index cdb63c9..cdb63c9 100644
--- a/sys/boot/efi/libefi/efinet.c
+++ b/stand/efi/libefi/efinet.c
diff --git a/sys/boot/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c
index 724233c..724233c 100644
--- a/sys/boot/efi/libefi/efipart.c
+++ b/stand/efi/libefi/efipart.c
diff --git a/sys/boot/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c
index 7c43476..7c43476 100644
--- a/sys/boot/efi/libefi/efizfs.c
+++ b/stand/efi/libefi/efizfs.c
diff --git a/sys/boot/efi/libefi/env.c b/stand/efi/libefi/env.c
index ceec7b2..ceec7b2 100644
--- a/sys/boot/efi/libefi/env.c
+++ b/stand/efi/libefi/env.c
diff --git a/sys/boot/efi/libefi/errno.c b/stand/efi/libefi/errno.c
index 0f354c3..0f354c3 100644
--- a/sys/boot/efi/libefi/errno.c
+++ b/stand/efi/libefi/errno.c
diff --git a/sys/boot/efi/libefi/handles.c b/stand/efi/libefi/handles.c
index 1e4ef6f..1e4ef6f 100644
--- a/sys/boot/efi/libefi/handles.c
+++ b/stand/efi/libefi/handles.c
diff --git a/sys/boot/efi/libefi/libefi.c b/stand/efi/libefi/libefi.c
index e0a721f..e0a721f 100644
--- a/sys/boot/efi/libefi/libefi.c
+++ b/stand/efi/libefi/libefi.c
diff --git a/sys/boot/efi/libefi/time.c b/stand/efi/libefi/time.c
index fe0d2ef..fe0d2ef 100644
--- a/sys/boot/efi/libefi/time.c
+++ b/stand/efi/libefi/time.c
diff --git a/sys/boot/efi/libefi/time_event.c b/stand/efi/libefi/time_event.c
index f96f1d8..f96f1d8 100644
--- a/sys/boot/efi/libefi/time_event.c
+++ b/stand/efi/libefi/time_event.c
diff --git a/sys/boot/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c
index d8d81ac..d8d81ac 100644
--- a/sys/boot/efi/libefi/wchar.c
+++ b/stand/efi/libefi/wchar.c
diff --git a/sys/boot/efi/loader/Makefile b/stand/efi/loader/Makefile
index 3b4c507..3b4c507 100644
--- a/sys/boot/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
diff --git a/sys/boot/efi/loader/Makefile.depend b/stand/efi/loader/Makefile.depend
index cca8fc0..cca8fc0 100644
--- a/sys/boot/efi/loader/Makefile.depend
+++ b/stand/efi/loader/Makefile.depend
diff --git a/sys/boot/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc
index b6d824c..b6d824c 100644
--- a/sys/boot/efi/loader/arch/amd64/Makefile.inc
+++ b/stand/efi/loader/arch/amd64/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/amd64/amd64_tramp.S b/stand/efi/loader/arch/amd64/amd64_tramp.S
index c102d92..c102d92 100644
--- a/sys/boot/efi/loader/arch/amd64/amd64_tramp.S
+++ b/stand/efi/loader/arch/amd64/amd64_tramp.S
diff --git a/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c
index 37e9fe1..37e9fe1 100644
--- a/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c
+++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c
diff --git a/sys/boot/efi/loader/arch/amd64/exc.S b/stand/efi/loader/arch/amd64/exc.S
index 0035d4a..0035d4a 100644
--- a/sys/boot/efi/loader/arch/amd64/exc.S
+++ b/stand/efi/loader/arch/amd64/exc.S
diff --git a/sys/boot/efi/loader/arch/amd64/ldscript.amd64 b/stand/efi/loader/arch/amd64/ldscript.amd64
index 874df9b..874df9b 100644
--- a/sys/boot/efi/loader/arch/amd64/ldscript.amd64
+++ b/stand/efi/loader/arch/amd64/ldscript.amd64
diff --git a/sys/boot/efi/loader/arch/amd64/start.S b/stand/efi/loader/arch/amd64/start.S
index 774ef4f..774ef4f 100644
--- a/sys/boot/efi/loader/arch/amd64/start.S
+++ b/stand/efi/loader/arch/amd64/start.S
diff --git a/sys/boot/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c
index e8cf188..e8cf188 100644
--- a/sys/boot/efi/loader/arch/amd64/trap.c
+++ b/stand/efi/loader/arch/amd64/trap.c
diff --git a/sys/boot/efi/loader/arch/arm/Makefile.inc b/stand/efi/loader/arch/arm/Makefile.inc
index 74e6616..74e6616 100644
--- a/sys/boot/efi/loader/arch/arm/Makefile.inc
+++ b/stand/efi/loader/arch/arm/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/arm/exec.c b/stand/efi/loader/arch/arm/exec.c
index 83d3f2b..83d3f2b 100644
--- a/sys/boot/efi/loader/arch/arm/exec.c
+++ b/stand/efi/loader/arch/arm/exec.c
diff --git a/sys/boot/efi/loader/arch/arm/ldscript.arm b/stand/efi/loader/arch/arm/ldscript.arm
index 9f6e7c2..9f6e7c2 100644
--- a/sys/boot/efi/loader/arch/arm/ldscript.arm
+++ b/stand/efi/loader/arch/arm/ldscript.arm
diff --git a/sys/boot/efi/loader/arch/arm/start.S b/stand/efi/loader/arch/arm/start.S
index 5b6182d..5b6182d 100644
--- a/sys/boot/efi/loader/arch/arm/start.S
+++ b/stand/efi/loader/arch/arm/start.S
diff --git a/sys/boot/efi/loader/arch/arm64/Makefile.inc b/stand/efi/loader/arch/arm64/Makefile.inc
index a71bcc2..a71bcc2 100644
--- a/sys/boot/efi/loader/arch/arm64/Makefile.inc
+++ b/stand/efi/loader/arch/arm64/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c
index 4532126..4532126 100644
--- a/sys/boot/efi/loader/arch/arm64/exec.c
+++ b/stand/efi/loader/arch/arm64/exec.c
diff --git a/sys/boot/efi/loader/arch/arm64/ldscript.arm64 b/stand/efi/loader/arch/arm64/ldscript.arm64
index 685c096..685c096 100644
--- a/sys/boot/efi/loader/arch/arm64/ldscript.arm64
+++ b/stand/efi/loader/arch/arm64/ldscript.arm64
diff --git a/sys/boot/efi/loader/arch/arm64/start.S b/stand/efi/loader/arch/arm64/start.S
index b58c2c5..b58c2c5 100644
--- a/sys/boot/efi/loader/arch/arm64/start.S
+++ b/stand/efi/loader/arch/arm64/start.S
diff --git a/sys/boot/efi/loader/arch/i386/Makefile.inc b/stand/efi/loader/arch/i386/Makefile.inc
index 70d2848..70d2848 100644
--- a/sys/boot/efi/loader/arch/i386/Makefile.inc
+++ b/stand/efi/loader/arch/i386/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/i386/bootinfo.c b/stand/efi/loader/arch/i386/bootinfo.c
index cbd6e4e..cbd6e4e 100644
--- a/sys/boot/efi/loader/arch/i386/bootinfo.c
+++ b/stand/efi/loader/arch/i386/bootinfo.c
diff --git a/sys/boot/efi/loader/arch/i386/efimd.c b/stand/efi/loader/arch/i386/efimd.c
index 8e1d850..8e1d850 100644
--- a/sys/boot/efi/loader/arch/i386/efimd.c
+++ b/stand/efi/loader/arch/i386/efimd.c
diff --git a/sys/boot/efi/loader/arch/i386/elf32_freebsd.c b/stand/efi/loader/arch/i386/elf32_freebsd.c
index d3c4261..d3c4261 100644
--- a/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
+++ b/stand/efi/loader/arch/i386/elf32_freebsd.c
diff --git a/sys/boot/efi/loader/arch/i386/exec.c b/stand/efi/loader/arch/i386/exec.c
index 579f559..579f559 100644
--- a/sys/boot/efi/loader/arch/i386/exec.c
+++ b/stand/efi/loader/arch/i386/exec.c
diff --git a/sys/boot/efi/loader/arch/i386/i386_copy.c b/stand/efi/loader/arch/i386/i386_copy.c
index 522913f..522913f 100644
--- a/sys/boot/efi/loader/arch/i386/i386_copy.c
+++ b/stand/efi/loader/arch/i386/i386_copy.c
diff --git a/sys/boot/efi/loader/arch/i386/ldscript.i386 b/stand/efi/loader/arch/i386/ldscript.i386
index e17212a..e17212a 100644
--- a/sys/boot/efi/loader/arch/i386/ldscript.i386
+++ b/stand/efi/loader/arch/i386/ldscript.i386
diff --git a/sys/boot/efi/loader/arch/i386/start.S b/stand/efi/loader/arch/i386/start.S
index b597f41..b597f41 100644
--- a/sys/boot/efi/loader/arch/i386/start.S
+++ b/stand/efi/loader/arch/i386/start.S
diff --git a/sys/boot/efi/loader/autoload.c b/stand/efi/loader/autoload.c
index c1eb849..c1eb849 100644
--- a/sys/boot/efi/loader/autoload.c
+++ b/stand/efi/loader/autoload.c
diff --git a/sys/boot/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c
index ca06a61..ca06a61 100644
--- a/sys/boot/efi/loader/bootinfo.c
+++ b/stand/efi/loader/bootinfo.c
diff --git a/sys/boot/efi/loader/conf.c b/stand/efi/loader/conf.c
index cea95b3..cea95b3 100644
--- a/sys/boot/efi/loader/conf.c
+++ b/stand/efi/loader/conf.c
diff --git a/sys/boot/efi/loader/copy.c b/stand/efi/loader/copy.c
index efa42b9..efa42b9 100644
--- a/sys/boot/efi/loader/copy.c
+++ b/stand/efi/loader/copy.c
diff --git a/sys/boot/efi/loader/efi_main.c b/stand/efi/loader/efi_main.c
index e424d89..e424d89 100644
--- a/sys/boot/efi/loader/efi_main.c
+++ b/stand/efi/loader/efi_main.c
diff --git a/sys/boot/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c
index 37999ea..37999ea 100644
--- a/sys/boot/efi/loader/framebuffer.c
+++ b/stand/efi/loader/framebuffer.c
diff --git a/sys/boot/efi/loader/framebuffer.h b/stand/efi/loader/framebuffer.h
index 2ec9017..2ec9017 100644
--- a/sys/boot/efi/loader/framebuffer.h
+++ b/stand/efi/loader/framebuffer.h
diff --git a/sys/boot/efi/loader/loader_efi.h b/stand/efi/loader/loader_efi.h
index 780fbfe..780fbfe 100644
--- a/sys/boot/efi/loader/loader_efi.h
+++ b/stand/efi/loader/loader_efi.h
diff --git a/sys/boot/efi/loader/main.c b/stand/efi/loader/main.c
index 129fd72..129fd72 100644
--- a/sys/boot/efi/loader/main.c
+++ b/stand/efi/loader/main.c
diff --git a/sys/boot/efi/loader/version b/stand/efi/loader/version
index 3a4c47c..3a4c47c 100644
--- a/sys/boot/efi/loader/version
+++ b/stand/efi/loader/version
diff --git a/sys/boot/fdt.mk b/stand/fdt.mk
index 4d4794d..4d4794d 100644
--- a/sys/boot/fdt.mk
+++ b/stand/fdt.mk
diff --git a/sys/boot/fdt/Makefile b/stand/fdt/Makefile
index dd31aac..dd31aac 100644
--- a/sys/boot/fdt/Makefile
+++ b/stand/fdt/Makefile
diff --git a/sys/boot/fdt/Makefile.depend b/stand/fdt/Makefile.depend
index 2984414..2984414 100644
--- a/sys/boot/fdt/Makefile.depend
+++ b/stand/fdt/Makefile.depend
diff --git a/sys/boot/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c
index 1b2737a..1b2737a 100644
--- a/sys/boot/fdt/fdt_loader_cmd.c
+++ b/stand/fdt/fdt_loader_cmd.c
diff --git a/sys/boot/fdt/fdt_platform.h b/stand/fdt/fdt_platform.h
index 8930340..8930340 100644
--- a/sys/boot/fdt/fdt_platform.h
+++ b/stand/fdt/fdt_platform.h
diff --git a/sys/boot/fdt/help.fdt b/stand/fdt/help.fdt
index 665f63c..665f63c 100644
--- a/sys/boot/fdt/help.fdt
+++ b/stand/fdt/help.fdt
diff --git a/sys/boot/ficl.mk b/stand/ficl.mk
index a0a1320..a0a1320 100644
--- a/sys/boot/ficl.mk
+++ b/stand/ficl.mk
diff --git a/sys/boot/ficl/Makefile b/stand/ficl/Makefile
index 9a13614..9a13614 100644
--- a/sys/boot/ficl/Makefile
+++ b/stand/ficl/Makefile
diff --git a/sys/boot/ficl/Makefile.depend b/stand/ficl/Makefile.depend
index c04b7c3..c04b7c3 100644
--- a/sys/boot/ficl/Makefile.depend
+++ b/stand/ficl/Makefile.depend
diff --git a/sys/boot/ficl/aarch64/sysdep.c b/stand/ficl/aarch64/sysdep.c
index ad38660..ad38660 100644
--- a/sys/boot/ficl/aarch64/sysdep.c
+++ b/stand/ficl/aarch64/sysdep.c
diff --git a/sys/boot/ficl/aarch64/sysdep.h b/stand/ficl/aarch64/sysdep.h
index 3726b9e..3726b9e 100644
--- a/sys/boot/ficl/aarch64/sysdep.h
+++ b/stand/ficl/aarch64/sysdep.h
diff --git a/sys/boot/ficl/amd64/sysdep.c b/stand/ficl/amd64/sysdep.c
index 5957b71..5957b71 100644
--- a/sys/boot/ficl/amd64/sysdep.c
+++ b/stand/ficl/amd64/sysdep.c
diff --git a/sys/boot/ficl/amd64/sysdep.h b/stand/ficl/amd64/sysdep.h
index 08bc0e1..08bc0e1 100644
--- a/sys/boot/ficl/amd64/sysdep.h
+++ b/stand/ficl/amd64/sysdep.h
diff --git a/sys/boot/ficl/arm/sysdep.c b/stand/ficl/arm/sysdep.c
index ad38660..ad38660 100644
--- a/sys/boot/ficl/arm/sysdep.c
+++ b/stand/ficl/arm/sysdep.c
diff --git a/sys/boot/ficl/arm/sysdep.h b/stand/ficl/arm/sysdep.h
index 00718ee..00718ee 100644
--- a/sys/boot/ficl/arm/sysdep.h
+++ b/stand/ficl/arm/sysdep.h
diff --git a/sys/boot/ficl/dict.c b/stand/ficl/dict.c
index b76d925..b76d925 100644
--- a/sys/boot/ficl/dict.c
+++ b/stand/ficl/dict.c
diff --git a/sys/boot/ficl/ficl.c b/stand/ficl/ficl.c
index 219cf84..219cf84 100644
--- a/sys/boot/ficl/ficl.c
+++ b/stand/ficl/ficl.c
diff --git a/sys/boot/ficl/ficl.h b/stand/ficl/ficl.h
index 8829cce..8829cce 100644
--- a/sys/boot/ficl/ficl.h
+++ b/stand/ficl/ficl.h
diff --git a/sys/boot/ficl/fileaccess.c b/stand/ficl/fileaccess.c
index 2b981c8..2b981c8 100644
--- a/sys/boot/ficl/fileaccess.c
+++ b/stand/ficl/fileaccess.c
diff --git a/sys/boot/ficl/float.c b/stand/ficl/float.c
index d757b23..d757b23 100644
--- a/sys/boot/ficl/float.c
+++ b/stand/ficl/float.c
diff --git a/sys/boot/ficl/i386/sysdep.c b/stand/ficl/i386/sysdep.c
index ea594e6..ea594e6 100644
--- a/sys/boot/ficl/i386/sysdep.c
+++ b/stand/ficl/i386/sysdep.c
diff --git a/sys/boot/ficl/i386/sysdep.h b/stand/ficl/i386/sysdep.h
index 94fda20..94fda20 100644
--- a/sys/boot/ficl/i386/sysdep.h
+++ b/stand/ficl/i386/sysdep.h
diff --git a/sys/boot/ficl/loader.c b/stand/ficl/loader.c
index 2246190..2246190 100644
--- a/sys/boot/ficl/loader.c
+++ b/stand/ficl/loader.c
diff --git a/sys/boot/ficl/math64.c b/stand/ficl/math64.c
index 6e50458..6e50458 100644
--- a/sys/boot/ficl/math64.c
+++ b/stand/ficl/math64.c
diff --git a/sys/boot/ficl/math64.h b/stand/ficl/math64.h
index a4e5636..a4e5636 100644
--- a/sys/boot/ficl/math64.h
+++ b/stand/ficl/math64.h
diff --git a/sys/boot/ficl/mips/sysdep.c b/stand/ficl/mips/sysdep.c
index ad38660..ad38660 100644
--- a/sys/boot/ficl/mips/sysdep.c
+++ b/stand/ficl/mips/sysdep.c
diff --git a/sys/boot/ficl/mips/sysdep.h b/stand/ficl/mips/sysdep.h
index 3ae748e..3ae748e 100644
--- a/sys/boot/ficl/mips/sysdep.h
+++ b/stand/ficl/mips/sysdep.h
diff --git a/sys/boot/ficl/mips64/sysdep.c b/stand/ficl/mips64/sysdep.c
index ad38660..ad38660 100644
--- a/sys/boot/ficl/mips64/sysdep.c
+++ b/stand/ficl/mips64/sysdep.c
diff --git a/sys/boot/ficl/mips64/sysdep.h b/stand/ficl/mips64/sysdep.h
index 5c9e163..5c9e163 100644
--- a/sys/boot/ficl/mips64/sysdep.h
+++ b/stand/ficl/mips64/sysdep.h
diff --git a/sys/boot/ficl/powerpc/sysdep.c b/stand/ficl/powerpc/sysdep.c
index ad38660..ad38660 100644
--- a/sys/boot/ficl/powerpc/sysdep.c
+++ b/stand/ficl/powerpc/sysdep.c
diff --git a/sys/boot/ficl/powerpc/sysdep.h b/stand/ficl/powerpc/sysdep.h
index 3ae748e..3ae748e 100644
--- a/sys/boot/ficl/powerpc/sysdep.h
+++ b/stand/ficl/powerpc/sysdep.h
diff --git a/sys/boot/ficl/prefix.c b/stand/ficl/prefix.c
index a34fc6c..a34fc6c 100644
--- a/sys/boot/ficl/prefix.c
+++ b/stand/ficl/prefix.c
diff --git a/sys/boot/ficl/riscv/sysdep.c b/stand/ficl/riscv/sysdep.c
index ad38660..ad38660 100644
--- a/sys/boot/ficl/riscv/sysdep.c
+++ b/stand/ficl/riscv/sysdep.c
diff --git a/sys/boot/ficl/riscv/sysdep.h b/stand/ficl/riscv/sysdep.h
index 3726b9e..3726b9e 100644
--- a/sys/boot/ficl/riscv/sysdep.h
+++ b/stand/ficl/riscv/sysdep.h
diff --git a/sys/boot/ficl/search.c b/stand/ficl/search.c
index d445cb3..d445cb3 100644
--- a/sys/boot/ficl/search.c
+++ b/stand/ficl/search.c
diff --git a/sys/boot/ficl/softwords/classes.fr b/stand/ficl/softwords/classes.fr
index b56da37..b56da37 100644
--- a/sys/boot/ficl/softwords/classes.fr
+++ b/stand/ficl/softwords/classes.fr
diff --git a/sys/boot/ficl/softwords/ficlclass.fr b/stand/ficl/softwords/ficlclass.fr
index 6d75efb..6d75efb 100644
--- a/sys/boot/ficl/softwords/ficlclass.fr
+++ b/stand/ficl/softwords/ficlclass.fr
diff --git a/sys/boot/ficl/softwords/ficllocal.fr b/stand/ficl/softwords/ficllocal.fr
index c916089..c916089 100644
--- a/sys/boot/ficl/softwords/ficllocal.fr
+++ b/stand/ficl/softwords/ficllocal.fr
diff --git a/sys/boot/ficl/softwords/fileaccess.fr b/stand/ficl/softwords/fileaccess.fr
index 7297df6..7297df6 100644
--- a/sys/boot/ficl/softwords/fileaccess.fr
+++ b/stand/ficl/softwords/fileaccess.fr
diff --git a/sys/boot/ficl/softwords/forml.fr b/stand/ficl/softwords/forml.fr
index 1144ef5..1144ef5 100644
--- a/sys/boot/ficl/softwords/forml.fr
+++ b/stand/ficl/softwords/forml.fr
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/stand/ficl/softwords/freebsd.fr
index 96205c0..96205c0 100644
--- a/sys/boot/ficl/softwords/freebsd.fr
+++ b/stand/ficl/softwords/freebsd.fr
diff --git a/sys/boot/ficl/softwords/ifbrack.fr b/stand/ficl/softwords/ifbrack.fr
index a8c6062..a8c6062 100644
--- a/sys/boot/ficl/softwords/ifbrack.fr
+++ b/stand/ficl/softwords/ifbrack.fr
diff --git a/sys/boot/ficl/softwords/jhlocal.fr b/stand/ficl/softwords/jhlocal.fr
index 12ccb9f..12ccb9f 100644
--- a/sys/boot/ficl/softwords/jhlocal.fr
+++ b/stand/ficl/softwords/jhlocal.fr
diff --git a/sys/boot/ficl/softwords/marker.fr b/stand/ficl/softwords/marker.fr
index ee3c9bd..ee3c9bd 100644
--- a/sys/boot/ficl/softwords/marker.fr
+++ b/stand/ficl/softwords/marker.fr
diff --git a/sys/boot/ficl/softwords/oo.fr b/stand/ficl/softwords/oo.fr
index b1c8e21..b1c8e21 100644
--- a/sys/boot/ficl/softwords/oo.fr
+++ b/stand/ficl/softwords/oo.fr
diff --git a/sys/boot/ficl/softwords/prefix.fr b/stand/ficl/softwords/prefix.fr
index ae1727f..ae1727f 100644
--- a/sys/boot/ficl/softwords/prefix.fr
+++ b/stand/ficl/softwords/prefix.fr
diff --git a/sys/boot/ficl/softwords/softcore.awk b/stand/ficl/softwords/softcore.awk
index 5a97999..5a97999 100644
--- a/sys/boot/ficl/softwords/softcore.awk
+++ b/stand/ficl/softwords/softcore.awk
diff --git a/sys/boot/ficl/softwords/softcore.fr b/stand/ficl/softwords/softcore.fr
index a70ebaa..a70ebaa 100644
--- a/sys/boot/ficl/softwords/softcore.fr
+++ b/stand/ficl/softwords/softcore.fr
diff --git a/sys/boot/ficl/softwords/string.fr b/stand/ficl/softwords/string.fr
index dabb390..dabb390 100644
--- a/sys/boot/ficl/softwords/string.fr
+++ b/stand/ficl/softwords/string.fr
diff --git a/sys/boot/ficl/sparc64/sysdep.c b/stand/ficl/sparc64/sysdep.c
index ad38660..ad38660 100644
--- a/sys/boot/ficl/sparc64/sysdep.c
+++ b/stand/ficl/sparc64/sysdep.c
diff --git a/sys/boot/ficl/sparc64/sysdep.h b/stand/ficl/sparc64/sysdep.h
index 0a6ca33..0a6ca33 100644
--- a/sys/boot/ficl/sparc64/sysdep.h
+++ b/stand/ficl/sparc64/sysdep.h
diff --git a/sys/boot/ficl/stack.c b/stand/ficl/stack.c
index f98a3b6..f98a3b6 100644
--- a/sys/boot/ficl/stack.c
+++ b/stand/ficl/stack.c
diff --git a/sys/boot/ficl/testmain.c b/stand/ficl/testmain.c
index 7167f30..7167f30 100644
--- a/sys/boot/ficl/testmain.c
+++ b/stand/ficl/testmain.c
diff --git a/sys/boot/ficl/tools.c b/stand/ficl/tools.c
index db1e948..db1e948 100644
--- a/sys/boot/ficl/tools.c
+++ b/stand/ficl/tools.c
diff --git a/sys/boot/ficl/unix.c b/stand/ficl/unix.c
index 5b56440..5b56440 100644
--- a/sys/boot/ficl/unix.c
+++ b/stand/ficl/unix.c
diff --git a/sys/boot/ficl/vm.c b/stand/ficl/vm.c
index 97a4f04..97a4f04 100644
--- a/sys/boot/ficl/vm.c
+++ b/stand/ficl/vm.c
diff --git a/sys/boot/ficl/words.c b/stand/ficl/words.c
index eee6fe9..eee6fe9 100644
--- a/sys/boot/ficl/words.c
+++ b/stand/ficl/words.c
diff --git a/sys/boot/ficl32/Makefile b/stand/ficl32/Makefile
index 0949946..0949946 100644
--- a/sys/boot/ficl32/Makefile
+++ b/stand/ficl32/Makefile
diff --git a/sys/boot/ficl32/Makefile.depend b/stand/ficl32/Makefile.depend
index c04b7c3..c04b7c3 100644
--- a/sys/boot/ficl32/Makefile.depend
+++ b/stand/ficl32/Makefile.depend
diff --git a/sys/boot/forth/Makefile b/stand/forth/Makefile
index 74d9ed7..74d9ed7 100644
--- a/sys/boot/forth/Makefile
+++ b/stand/forth/Makefile
diff --git a/sys/boot/forth/Makefile.depend b/stand/forth/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/forth/Makefile.depend
+++ b/stand/forth/Makefile.depend
diff --git a/sys/boot/forth/beastie.4th b/stand/forth/beastie.4th
index 752cce2..752cce2 100644
--- a/sys/boot/forth/beastie.4th
+++ b/stand/forth/beastie.4th
diff --git a/sys/boot/forth/beastie.4th.8 b/stand/forth/beastie.4th.8
index e99f654..e99f654 100644
--- a/sys/boot/forth/beastie.4th.8
+++ b/stand/forth/beastie.4th.8
diff --git a/sys/boot/forth/brand-fbsd.4th b/stand/forth/brand-fbsd.4th
index 9cd017f..9cd017f 100644
--- a/sys/boot/forth/brand-fbsd.4th
+++ b/stand/forth/brand-fbsd.4th
diff --git a/sys/boot/forth/brand.4th b/stand/forth/brand.4th
index 39a9bfa..39a9bfa 100644
--- a/sys/boot/forth/brand.4th
+++ b/stand/forth/brand.4th
diff --git a/sys/boot/forth/brand.4th.8 b/stand/forth/brand.4th.8
index dfd188d..dfd188d 100644
--- a/sys/boot/forth/brand.4th.8
+++ b/stand/forth/brand.4th.8
diff --git a/sys/boot/forth/check-password.4th b/stand/forth/check-password.4th
index d41777c..d41777c 100644
--- a/sys/boot/forth/check-password.4th
+++ b/stand/forth/check-password.4th
diff --git a/sys/boot/forth/check-password.4th.8 b/stand/forth/check-password.4th.8
index db0aa4b..db0aa4b 100644
--- a/sys/boot/forth/check-password.4th.8
+++ b/stand/forth/check-password.4th.8
diff --git a/sys/boot/forth/color.4th b/stand/forth/color.4th
index 65e6de9..65e6de9 100644
--- a/sys/boot/forth/color.4th
+++ b/stand/forth/color.4th
diff --git a/sys/boot/forth/color.4th.8 b/stand/forth/color.4th.8
index 9191da0..9191da0 100644
--- a/sys/boot/forth/color.4th.8
+++ b/stand/forth/color.4th.8
diff --git a/sys/boot/forth/delay.4th b/stand/forth/delay.4th
index 28cfa5c..28cfa5c 100644
--- a/sys/boot/forth/delay.4th
+++ b/stand/forth/delay.4th
diff --git a/sys/boot/forth/delay.4th.8 b/stand/forth/delay.4th.8
index af31fd0..af31fd0 100644
--- a/sys/boot/forth/delay.4th.8
+++ b/stand/forth/delay.4th.8
diff --git a/sys/boot/forth/efi.4th b/stand/forth/efi.4th
index 7c1bdf3..7c1bdf3 100644
--- a/sys/boot/forth/efi.4th
+++ b/stand/forth/efi.4th
diff --git a/sys/boot/forth/frames.4th b/stand/forth/frames.4th
index 0f8d460..0f8d460 100644
--- a/sys/boot/forth/frames.4th
+++ b/stand/forth/frames.4th
diff --git a/sys/boot/forth/loader.4th b/stand/forth/loader.4th
index 9486237..9486237 100644
--- a/sys/boot/forth/loader.4th
+++ b/stand/forth/loader.4th
diff --git a/sys/boot/forth/loader.4th.8 b/stand/forth/loader.4th.8
index b689077..b689077 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/stand/forth/loader.4th.8
diff --git a/sys/boot/forth/loader.conf b/stand/forth/loader.conf
index 9136659..9136659 100644
--- a/sys/boot/forth/loader.conf
+++ b/stand/forth/loader.conf
diff --git a/sys/boot/forth/loader.conf.5 b/stand/forth/loader.conf.5
index 631250c..631250c 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/stand/forth/loader.conf.5
diff --git a/sys/boot/forth/loader.rc b/stand/forth/loader.rc
index 0bc6657..0bc6657 100644
--- a/sys/boot/forth/loader.rc
+++ b/stand/forth/loader.rc
diff --git a/sys/boot/forth/logo-beastie.4th b/stand/forth/logo-beastie.4th
index 671eb5e..671eb5e 100644
--- a/sys/boot/forth/logo-beastie.4th
+++ b/stand/forth/logo-beastie.4th
diff --git a/sys/boot/forth/logo-beastiebw.4th b/stand/forth/logo-beastiebw.4th
index 197099c..197099c 100644
--- a/sys/boot/forth/logo-beastiebw.4th
+++ b/stand/forth/logo-beastiebw.4th
diff --git a/sys/boot/forth/logo-fbsdbw.4th b/stand/forth/logo-fbsdbw.4th
index d4a532b..d4a532b 100644
--- a/sys/boot/forth/logo-fbsdbw.4th
+++ b/stand/forth/logo-fbsdbw.4th
diff --git a/sys/boot/forth/logo-orb.4th b/stand/forth/logo-orb.4th
index c2a504d..c2a504d 100644
--- a/sys/boot/forth/logo-orb.4th
+++ b/stand/forth/logo-orb.4th
diff --git a/sys/boot/forth/logo-orbbw.4th b/stand/forth/logo-orbbw.4th
index 11dc11c..11dc11c 100644
--- a/sys/boot/forth/logo-orbbw.4th
+++ b/stand/forth/logo-orbbw.4th
diff --git a/sys/boot/forth/menu-commands.4th b/stand/forth/menu-commands.4th
index 9adf30a..9adf30a 100644
--- a/sys/boot/forth/menu-commands.4th
+++ b/stand/forth/menu-commands.4th
diff --git a/sys/boot/forth/menu.4th b/stand/forth/menu.4th
index e3fe0f7..e3fe0f7 100644
--- a/sys/boot/forth/menu.4th
+++ b/stand/forth/menu.4th
diff --git a/sys/boot/forth/menu.4th.8 b/stand/forth/menu.4th.8
index 3673eec..3673eec 100644
--- a/sys/boot/forth/menu.4th.8
+++ b/stand/forth/menu.4th.8
diff --git a/sys/boot/forth/menu.rc b/stand/forth/menu.rc
index 6fe3dfe..6fe3dfe 100644
--- a/sys/boot/forth/menu.rc
+++ b/stand/forth/menu.rc
diff --git a/sys/boot/forth/menusets.4th b/stand/forth/menusets.4th
index 9335b80..9335b80 100644
--- a/sys/boot/forth/menusets.4th
+++ b/stand/forth/menusets.4th
diff --git a/sys/boot/forth/menusets.4th.8 b/stand/forth/menusets.4th.8
index f785ae1..f785ae1 100644
--- a/sys/boot/forth/menusets.4th.8
+++ b/stand/forth/menusets.4th.8
diff --git a/sys/boot/forth/pcibios.4th b/stand/forth/pcibios.4th
index 71702da..71702da 100644
--- a/sys/boot/forth/pcibios.4th
+++ b/stand/forth/pcibios.4th
diff --git a/sys/boot/forth/pnp.4th b/stand/forth/pnp.4th
index 8be89d8..5ce2355 100644
--- a/sys/boot/forth/pnp.4th
+++ b/stand/forth/pnp.4th
@@ -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/config/bootstrap.h
 	ptr pnpi.desc
 	int pnpi.revision
 	ptr pnpi.module				\ (char*) module args
diff --git a/sys/boot/forth/screen.4th b/stand/forth/screen.4th
index e0af82b..e0af82b 100644
--- a/sys/boot/forth/screen.4th
+++ b/stand/forth/screen.4th
diff --git a/sys/boot/forth/shortcuts.4th b/stand/forth/shortcuts.4th
index 33a1cf6..33a1cf6 100644
--- a/sys/boot/forth/shortcuts.4th
+++ b/stand/forth/shortcuts.4th
diff --git a/sys/boot/forth/support.4th b/stand/forth/support.4th
index 7ce9e52..aa50b3b 100644
--- a/sys/boot/forth/support.4th
+++ b/stand/forth/support.4th
@@ -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
diff --git a/sys/boot/forth/version.4th b/stand/forth/version.4th
index a5311b4..a5311b4 100644
--- a/sys/boot/forth/version.4th
+++ b/stand/forth/version.4th
diff --git a/sys/boot/forth/version.4th.8 b/stand/forth/version.4th.8
index 256df1e..256df1e 100644
--- a/sys/boot/forth/version.4th.8
+++ b/stand/forth/version.4th.8
diff --git a/sys/boot/geli/Makefile b/stand/geli/Makefile
index c790431..c790431 100644
--- a/sys/boot/geli/Makefile
+++ b/stand/geli/Makefile
diff --git a/sys/boot/geli/Makefile.depend b/stand/geli/Makefile.depend
index 7b57224..7b57224 100644
--- a/sys/boot/geli/Makefile.depend
+++ b/stand/geli/Makefile.depend
diff --git a/sys/boot/geli/geliboot.c b/stand/geli/geliboot.c
index 2fca7ba..2fca7ba 100644
--- a/sys/boot/geli/geliboot.c
+++ b/stand/geli/geliboot.c
diff --git a/sys/boot/geli/geliboot.h b/stand/geli/geliboot.h
index 788b82c..788b82c 100644
--- a/sys/boot/geli/geliboot.h
+++ b/stand/geli/geliboot.h
diff --git a/sys/boot/geli/geliboot_crypto.c b/stand/geli/geliboot_crypto.c
index 4187e97..4187e97 100644
--- a/sys/boot/geli/geliboot_crypto.c
+++ b/stand/geli/geliboot_crypto.c
diff --git a/sys/boot/geli/geliboot_internal.h b/stand/geli/geliboot_internal.h
index 1fad3c5..1fad3c5 100644
--- a/sys/boot/geli/geliboot_internal.h
+++ b/stand/geli/geliboot_internal.h
diff --git a/sys/boot/geli/pwgets.c b/stand/geli/pwgets.c
index 36f9391..36f9391 100644
--- a/sys/boot/geli/pwgets.c
+++ b/stand/geli/pwgets.c
diff --git a/sys/boot/i386/Makefile b/stand/i386/Makefile
index 9a1663a..9a1663a 100644
--- a/sys/boot/i386/Makefile
+++ b/stand/i386/Makefile
diff --git a/sys/boot/i386/Makefile.inc b/stand/i386/Makefile.inc
index 5c36555..6a4bea7 100644
--- a/sys/boot/i386/Makefile.inc
+++ b/stand/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# Common defines for all of /sys/boot/i386/
+# Common defines for all of /stand/i386/
 #
 # $FreeBSD$
 
diff --git a/sys/boot/i386/boot.ldscript b/stand/i386/boot.ldscript
index 04ea39d..04ea39d 100644
--- a/sys/boot/i386/boot.ldscript
+++ b/stand/i386/boot.ldscript
diff --git a/sys/boot/i386/boot0/Makefile b/stand/i386/boot0/Makefile
index 39c0072..39c0072 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/stand/i386/boot0/Makefile
diff --git a/sys/boot/i386/boot0/Makefile.depend b/stand/i386/boot0/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/boot0/Makefile.depend
+++ b/stand/i386/boot0/Makefile.depend
diff --git a/sys/boot/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S
index 708f093..708f093 100644
--- a/sys/boot/i386/boot0/boot0.S
+++ b/stand/i386/boot0/boot0.S
diff --git a/sys/boot/i386/boot0sio/Makefile b/stand/i386/boot0sio/Makefile
index 1321dd3..1321dd3 100644
--- a/sys/boot/i386/boot0sio/Makefile
+++ b/stand/i386/boot0sio/Makefile
diff --git a/sys/boot/i386/boot0sio/Makefile.depend b/stand/i386/boot0sio/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/boot0sio/Makefile.depend
+++ b/stand/i386/boot0sio/Makefile.depend
diff --git a/sys/boot/i386/boot2/Makefile b/stand/i386/boot2/Makefile
index c3146b3..c3146b3 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/stand/i386/boot2/Makefile
diff --git a/sys/boot/i386/boot2/Makefile.depend b/stand/i386/boot2/Makefile.depend
index d5a67a6..d5a67a6 100644
--- a/sys/boot/i386/boot2/Makefile.depend
+++ b/stand/i386/boot2/Makefile.depend
diff --git a/sys/boot/i386/boot2/boot1.S b/stand/i386/boot2/boot1.S
index 984ab52..984ab52 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/stand/i386/boot2/boot1.S
diff --git a/sys/boot/i386/boot2/boot2.c b/stand/i386/boot2/boot2.c
index cc5d76f..cc5d76f 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/stand/i386/boot2/boot2.c
diff --git a/sys/boot/i386/boot2/lib.h b/stand/i386/boot2/lib.h
index d8d3317..d8d3317 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/stand/i386/boot2/lib.h
diff --git a/sys/boot/i386/boot2/sio.S b/stand/i386/boot2/sio.S
index ca9d0a2..ca9d0a2 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/stand/i386/boot2/sio.S
diff --git a/sys/boot/i386/btx/Makefile b/stand/i386/btx/Makefile
index 39f78ed..39f78ed 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/stand/i386/btx/Makefile
diff --git a/sys/boot/i386/btx/Makefile.inc b/stand/i386/btx/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/i386/btx/Makefile.inc
+++ b/stand/i386/btx/Makefile.inc
diff --git a/sys/boot/i386/btx/btx/Makefile b/stand/i386/btx/btx/Makefile
index f42e20d..f42e20d 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/stand/i386/btx/btx/Makefile
diff --git a/sys/boot/i386/btx/btx/Makefile.depend b/stand/i386/btx/btx/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/btx/btx/Makefile.depend
+++ b/stand/i386/btx/btx/Makefile.depend
diff --git a/sys/boot/i386/btx/btx/btx.S b/stand/i386/btx/btx/btx.S
index 87d09a5..87d09a5 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/stand/i386/btx/btx/btx.S
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/stand/i386/btx/btxldr/Makefile
index 3279597..3279597 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/stand/i386/btx/btxldr/Makefile
diff --git a/sys/boot/i386/btx/btxldr/Makefile.depend b/stand/i386/btx/btxldr/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/btx/btxldr/Makefile.depend
+++ b/stand/i386/btx/btxldr/Makefile.depend
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/stand/i386/btx/btxldr/btxldr.S
index 1a0f5f4..1a0f5f4 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/stand/i386/btx/btxldr/btxldr.S
diff --git a/sys/boot/i386/btx/lib/Makefile b/stand/i386/btx/lib/Makefile
index 8de6255..8de6255 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/stand/i386/btx/lib/Makefile
diff --git a/sys/boot/i386/btx/lib/Makefile.depend b/stand/i386/btx/lib/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/btx/lib/Makefile.depend
+++ b/stand/i386/btx/lib/Makefile.depend
diff --git a/sys/boot/i386/btx/lib/btxcsu.S b/stand/i386/btx/lib/btxcsu.S
index c46f809..c46f809 100644
--- a/sys/boot/i386/btx/lib/btxcsu.S
+++ b/stand/i386/btx/lib/btxcsu.S
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/stand/i386/btx/lib/btxsys.s
index 9c77b42..9c77b42 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/stand/i386/btx/lib/btxsys.s
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/stand/i386/btx/lib/btxv86.h
index f04ce5e..f04ce5e 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/stand/i386/btx/lib/btxv86.h
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/stand/i386/btx/lib/btxv86.s
index 0d7d111..0d7d111 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/stand/i386/btx/lib/btxv86.s
diff --git a/sys/boot/i386/cdboot/Makefile b/stand/i386/cdboot/Makefile
index 7acd404..7acd404 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/stand/i386/cdboot/Makefile
diff --git a/sys/boot/i386/cdboot/Makefile.depend b/stand/i386/cdboot/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/cdboot/Makefile.depend
+++ b/stand/i386/cdboot/Makefile.depend
diff --git a/sys/boot/i386/cdboot/cdboot.S b/stand/i386/cdboot/cdboot.S
index 9c3fb15..9c3fb15 100644
--- a/sys/boot/i386/cdboot/cdboot.S
+++ b/stand/i386/cdboot/cdboot.S
diff --git a/sys/boot/i386/common/bootargs.h b/stand/i386/common/bootargs.h
index df55807..df55807 100644
--- a/sys/boot/i386/common/bootargs.h
+++ b/stand/i386/common/bootargs.h
diff --git a/sys/boot/i386/common/cons.c b/stand/i386/common/cons.c
index 5fb1a93..5fb1a93 100644
--- a/sys/boot/i386/common/cons.c
+++ b/stand/i386/common/cons.c
diff --git a/sys/boot/i386/common/cons.h b/stand/i386/common/cons.h
index 73474fb..73474fb 100644
--- a/sys/boot/i386/common/cons.h
+++ b/stand/i386/common/cons.h
diff --git a/sys/boot/i386/common/drv.c b/stand/i386/common/drv.c
index a805c41..a805c41 100644
--- a/sys/boot/i386/common/drv.c
+++ b/stand/i386/common/drv.c
diff --git a/sys/boot/i386/common/drv.h b/stand/i386/common/drv.h
index c0995df..c0995df 100644
--- a/sys/boot/i386/common/drv.h
+++ b/stand/i386/common/drv.h
diff --git a/sys/boot/i386/common/edd.h b/stand/i386/common/edd.h
index 7d1f450..7d1f450 100644
--- a/sys/boot/i386/common/edd.h
+++ b/stand/i386/common/edd.h
diff --git a/sys/boot/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile
index 9e62007..9e62007 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/stand/i386/gptboot/Makefile
diff --git a/sys/boot/i386/gptboot/Makefile.depend b/stand/i386/gptboot/Makefile.depend
index 295be1a..295be1a 100644
--- a/sys/boot/i386/gptboot/Makefile.depend
+++ b/stand/i386/gptboot/Makefile.depend
diff --git a/sys/boot/i386/gptboot/gptboot.8 b/stand/i386/gptboot/gptboot.8
index a7afd81..a7afd81 100644
--- a/sys/boot/i386/gptboot/gptboot.8
+++ b/stand/i386/gptboot/gptboot.8
diff --git a/sys/boot/i386/gptboot/gptboot.c b/stand/i386/gptboot/gptboot.c
index dd06f0c..dd06f0c 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/stand/i386/gptboot/gptboot.c
diff --git a/sys/boot/i386/gptboot/gptldr.S b/stand/i386/gptboot/gptldr.S
index 088122f..088122f 100644
--- a/sys/boot/i386/gptboot/gptldr.S
+++ b/stand/i386/gptboot/gptldr.S
diff --git a/sys/boot/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile
index 97f1954..97f1954 100644
--- a/sys/boot/i386/gptzfsboot/Makefile
+++ b/stand/i386/gptzfsboot/Makefile
diff --git a/sys/boot/i386/gptzfsboot/Makefile.depend b/stand/i386/gptzfsboot/Makefile.depend
index 295be1a..295be1a 100644
--- a/sys/boot/i386/gptzfsboot/Makefile.depend
+++ b/stand/i386/gptzfsboot/Makefile.depend
diff --git a/sys/boot/i386/gptzfsboot/gptzfsboot.8 b/stand/i386/gptzfsboot/gptzfsboot.8
index 66feb6d..66feb6d 100644
--- a/sys/boot/i386/gptzfsboot/gptzfsboot.8
+++ b/stand/i386/gptzfsboot/gptzfsboot.8
diff --git a/sys/boot/i386/kgzldr/Makefile b/stand/i386/kgzldr/Makefile
index 5a03b83..5a03b83 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/stand/i386/kgzldr/Makefile
diff --git a/sys/boot/i386/kgzldr/Makefile.depend b/stand/i386/kgzldr/Makefile.depend
index 79506ce..79506ce 100644
--- a/sys/boot/i386/kgzldr/Makefile.depend
+++ b/stand/i386/kgzldr/Makefile.depend
diff --git a/sys/boot/i386/kgzldr/boot.c b/stand/i386/kgzldr/boot.c
index 45ed2ee..45ed2ee 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/stand/i386/kgzldr/boot.c
diff --git a/sys/boot/i386/kgzldr/crt.s b/stand/i386/kgzldr/crt.s
index cfb479f..cfb479f 100644
--- a/sys/boot/i386/kgzldr/crt.s
+++ b/stand/i386/kgzldr/crt.s
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/stand/i386/kgzldr/kgzldr.h
index 5cd5b44..5cd5b44 100644
--- a/sys/boot/i386/kgzldr/kgzldr.h
+++ b/stand/i386/kgzldr/kgzldr.h
diff --git a/sys/boot/i386/kgzldr/lib.c b/stand/i386/kgzldr/lib.c
index 538875b..538875b 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/stand/i386/kgzldr/lib.c
diff --git a/sys/boot/i386/kgzldr/sio.s b/stand/i386/kgzldr/sio.s
index ff174eb..ff174eb 100644
--- a/sys/boot/i386/kgzldr/sio.s
+++ b/stand/i386/kgzldr/sio.s
diff --git a/sys/boot/i386/kgzldr/start.s b/stand/i386/kgzldr/start.s
index 550fa52..550fa52 100644
--- a/sys/boot/i386/kgzldr/start.s
+++ b/stand/i386/kgzldr/start.s
diff --git a/sys/boot/i386/libfirewire/Makefile b/stand/i386/libfirewire/Makefile
index d3f88c4..d3f88c4 100644
--- a/sys/boot/i386/libfirewire/Makefile
+++ b/stand/i386/libfirewire/Makefile
diff --git a/sys/boot/i386/libfirewire/Makefile.depend b/stand/i386/libfirewire/Makefile.depend
index 18be76b..18be76b 100644
--- a/sys/boot/i386/libfirewire/Makefile.depend
+++ b/stand/i386/libfirewire/Makefile.depend
diff --git a/sys/boot/i386/libfirewire/dconsole.c b/stand/i386/libfirewire/dconsole.c
index 1528faf..1528faf 100644
--- a/sys/boot/i386/libfirewire/dconsole.c
+++ b/stand/i386/libfirewire/dconsole.c
diff --git a/sys/boot/i386/libfirewire/firewire.c b/stand/i386/libfirewire/firewire.c
index 4840325..4840325 100644
--- a/sys/boot/i386/libfirewire/firewire.c
+++ b/stand/i386/libfirewire/firewire.c
diff --git a/sys/boot/i386/libfirewire/fwohci.c b/stand/i386/libfirewire/fwohci.c
index 567abcf..567abcf 100644
--- a/sys/boot/i386/libfirewire/fwohci.c
+++ b/stand/i386/libfirewire/fwohci.c
diff --git a/sys/boot/i386/libfirewire/fwohci.h b/stand/i386/libfirewire/fwohci.h
index 4a93220..4a93220 100644
--- a/sys/boot/i386/libfirewire/fwohci.h
+++ b/stand/i386/libfirewire/fwohci.h
diff --git a/sys/boot/i386/libfirewire/fwohcireg.h b/stand/i386/libfirewire/fwohcireg.h
index d57870c..d57870c 100644
--- a/sys/boot/i386/libfirewire/fwohcireg.h
+++ b/stand/i386/libfirewire/fwohcireg.h
diff --git a/sys/boot/i386/libi386/Makefile b/stand/i386/libi386/Makefile
index 8d65513..8d65513 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/stand/i386/libi386/Makefile
diff --git a/sys/boot/i386/libi386/Makefile.depend b/stand/i386/libi386/Makefile.depend
index df20c96..df20c96 100644
--- a/sys/boot/i386/libi386/Makefile.depend
+++ b/stand/i386/libi386/Makefile.depend
diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/stand/i386/libi386/amd64_tramp.S
index 6359b90..6359b90 100644
--- a/sys/boot/i386/libi386/amd64_tramp.S
+++ b/stand/i386/libi386/amd64_tramp.S
diff --git a/sys/boot/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c
index 8167fca..8167fca 100644
--- a/sys/boot/i386/libi386/biosacpi.c
+++ b/stand/i386/libi386/biosacpi.c
diff --git a/sys/boot/i386/libi386/bioscd.c b/stand/i386/libi386/bioscd.c
index 2e8fc3b..2e8fc3b 100644
--- a/sys/boot/i386/libi386/bioscd.c
+++ b/stand/i386/libi386/bioscd.c
diff --git a/sys/boot/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c
index a2147e2..a2147e2 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/stand/i386/libi386/biosdisk.c
diff --git a/sys/boot/i386/libi386/biosmem.c b/stand/i386/libi386/biosmem.c
index 7105757..7105757 100644
--- a/sys/boot/i386/libi386/biosmem.c
+++ b/stand/i386/libi386/biosmem.c
diff --git a/sys/boot/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c
index 098e30c..098e30c 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/stand/i386/libi386/biospci.c
diff --git a/sys/boot/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c
index 30e55fc..30e55fc 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/stand/i386/libi386/biospnp.c
diff --git a/sys/boot/i386/libi386/biossmap.c b/stand/i386/libi386/biossmap.c
index e95ea64..e95ea64 100644
--- a/sys/boot/i386/libi386/biossmap.c
+++ b/stand/i386/libi386/biossmap.c
diff --git a/sys/boot/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c
index c33cec7..c33cec7 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/stand/i386/libi386/bootinfo.c
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c
index 494688f..494688f 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/stand/i386/libi386/bootinfo32.c
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c
index 02fcf72..02fcf72 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/stand/i386/libi386/bootinfo64.c
diff --git a/sys/boot/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c
index f98a1f7..f98a1f7 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/stand/i386/libi386/comconsole.c
diff --git a/sys/boot/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c
index c7705d7..c7705d7 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/stand/i386/libi386/devicename.c
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c
index 641e273..641e273 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/stand/i386/libi386/elf32_freebsd.c
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c
index 338a745..338a745 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/stand/i386/libi386/elf64_freebsd.c
diff --git a/sys/boot/i386/libi386/i386_copy.c b/stand/i386/libi386/i386_copy.c
index 3c05241..3c05241 100644
--- a/sys/boot/i386/libi386/i386_copy.c
+++ b/stand/i386/libi386/i386_copy.c
diff --git a/sys/boot/i386/libi386/i386_module.c b/stand/i386/libi386/i386_module.c
index 78ab61b..78ab61b 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/stand/i386/libi386/i386_module.c
diff --git a/sys/boot/i386/libi386/libi386.h b/stand/i386/libi386/libi386.h
index e65a060..e65a060 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/stand/i386/libi386/libi386.h
diff --git a/sys/boot/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c
index 9aac640..9aac640 100644
--- a/sys/boot/i386/libi386/multiboot.c
+++ b/stand/i386/libi386/multiboot.c
diff --git a/sys/boot/i386/libi386/multiboot.h b/stand/i386/libi386/multiboot.h
index 819fa2e..819fa2e 100644
--- a/sys/boot/i386/libi386/multiboot.h
+++ b/stand/i386/libi386/multiboot.h
diff --git a/sys/boot/i386/libi386/multiboot_tramp.S b/stand/i386/libi386/multiboot_tramp.S
index 0bd6043..0bd6043 100644
--- a/sys/boot/i386/libi386/multiboot_tramp.S
+++ b/stand/i386/libi386/multiboot_tramp.S
diff --git a/sys/boot/i386/libi386/nullconsole.c b/stand/i386/libi386/nullconsole.c
index ebb1e7e..ebb1e7e 100644
--- a/sys/boot/i386/libi386/nullconsole.c
+++ b/stand/i386/libi386/nullconsole.c
diff --git a/sys/boot/i386/libi386/pread.c b/stand/i386/libi386/pread.c
index 870e254..870e254 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/stand/i386/libi386/pread.c
diff --git a/sys/boot/i386/libi386/pxe.c b/stand/i386/libi386/pxe.c
index 7cb4833..7cb4833 100644
--- a/sys/boot/i386/libi386/pxe.c
+++ b/stand/i386/libi386/pxe.c
diff --git a/sys/boot/i386/libi386/pxe.h b/stand/i386/libi386/pxe.h
index 119c86b..119c86b 100644
--- a/sys/boot/i386/libi386/pxe.h
+++ b/stand/i386/libi386/pxe.h
diff --git a/sys/boot/i386/libi386/pxetramp.s b/stand/i386/libi386/pxetramp.s
index dcf1441..dcf1441 100644
--- a/sys/boot/i386/libi386/pxetramp.s
+++ b/stand/i386/libi386/pxetramp.s
diff --git a/sys/boot/i386/libi386/relocater_tramp.S b/stand/i386/libi386/relocater_tramp.S
index 6db4a75..6db4a75 100644
--- a/sys/boot/i386/libi386/relocater_tramp.S
+++ b/stand/i386/libi386/relocater_tramp.S
diff --git a/sys/boot/i386/libi386/smbios.c b/stand/i386/libi386/smbios.c
index 2aa62fa..2aa62fa 100644
--- a/sys/boot/i386/libi386/smbios.c
+++ b/stand/i386/libi386/smbios.c
diff --git a/sys/boot/i386/libi386/smbios.h b/stand/i386/libi386/smbios.h
index 03fc07e..03fc07e 100644
--- a/sys/boot/i386/libi386/smbios.h
+++ b/stand/i386/libi386/smbios.h
diff --git a/sys/boot/i386/libi386/spinconsole.c b/stand/i386/libi386/spinconsole.c
index 1daac35..1daac35 100644
--- a/sys/boot/i386/libi386/spinconsole.c
+++ b/stand/i386/libi386/spinconsole.c
diff --git a/sys/boot/i386/libi386/time.c b/stand/i386/libi386/time.c
index 7636ace..7636ace 100644
--- a/sys/boot/i386/libi386/time.c
+++ b/stand/i386/libi386/time.c
diff --git a/sys/boot/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c
index 073d531..073d531 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/stand/i386/libi386/vidconsole.c
diff --git a/sys/boot/i386/loader/Makefile b/stand/i386/loader/Makefile
index 40ac46c..40ac46c 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
diff --git a/sys/boot/i386/loader/Makefile.depend b/stand/i386/loader/Makefile.depend
index 89d5422..89d5422 100644
--- a/sys/boot/i386/loader/Makefile.depend
+++ b/stand/i386/loader/Makefile.depend
diff --git a/sys/boot/i386/loader/chain.c b/stand/i386/loader/chain.c
index d6810ef..d6810ef 100644
--- a/sys/boot/i386/loader/chain.c
+++ b/stand/i386/loader/chain.c
diff --git a/sys/boot/i386/loader/conf.c b/stand/i386/loader/conf.c
index 29ce1e3..29ce1e3 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/stand/i386/loader/conf.c
diff --git a/sys/boot/i386/loader/help.i386 b/stand/i386/loader/help.i386
index 0ff6286..0ff6286 100644
--- a/sys/boot/i386/loader/help.i386
+++ b/stand/i386/loader/help.i386
diff --git a/sys/boot/i386/loader/loader.rc b/stand/i386/loader/loader.rc
index 287c05e..287c05e 100644
--- a/sys/boot/i386/loader/loader.rc
+++ b/stand/i386/loader/loader.rc
diff --git a/sys/boot/i386/loader/main.c b/stand/i386/loader/main.c
index 81bc2ff..81bc2ff 100644
--- a/sys/boot/i386/loader/main.c
+++ b/stand/i386/loader/main.c
diff --git a/sys/boot/i386/loader/version b/stand/i386/loader/version
index 7a2acaf..7a2acaf 100644
--- a/sys/boot/i386/loader/version
+++ b/stand/i386/loader/version
diff --git a/sys/boot/i386/mbr/Makefile b/stand/i386/mbr/Makefile
index 9bfa0bd..9bfa0bd 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/stand/i386/mbr/Makefile
diff --git a/sys/boot/i386/mbr/Makefile.depend b/stand/i386/mbr/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/mbr/Makefile.depend
+++ b/stand/i386/mbr/Makefile.depend
diff --git a/sys/boot/i386/mbr/mbr.s b/stand/i386/mbr/mbr.s
index 3cfc20d..3cfc20d 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/stand/i386/mbr/mbr.s
diff --git a/sys/boot/i386/pmbr/Makefile b/stand/i386/pmbr/Makefile
index 1bfe0ee..1bfe0ee 100644
--- a/sys/boot/i386/pmbr/Makefile
+++ b/stand/i386/pmbr/Makefile
diff --git a/sys/boot/i386/pmbr/Makefile.depend b/stand/i386/pmbr/Makefile.depend
index f80275d..f80275d 100644
--- a/sys/boot/i386/pmbr/Makefile.depend
+++ b/stand/i386/pmbr/Makefile.depend
diff --git a/sys/boot/i386/pmbr/pmbr.s b/stand/i386/pmbr/pmbr.s
index 1a75881..1a75881 100644
--- a/sys/boot/i386/pmbr/pmbr.s
+++ b/stand/i386/pmbr/pmbr.s
diff --git a/sys/boot/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile
index 819283c..819283c 100644
--- a/sys/boot/i386/pxeldr/Makefile
+++ b/stand/i386/pxeldr/Makefile
diff --git a/sys/boot/i386/pxeldr/Makefile.depend b/stand/i386/pxeldr/Makefile.depend
index c6f574a..c6f574a 100644
--- a/sys/boot/i386/pxeldr/Makefile.depend
+++ b/stand/i386/pxeldr/Makefile.depend
diff --git a/sys/boot/i386/pxeldr/pxeboot.8 b/stand/i386/pxeldr/pxeboot.8
index 0194e21..0194e21 100644
--- a/sys/boot/i386/pxeldr/pxeboot.8
+++ b/stand/i386/pxeldr/pxeboot.8
diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/stand/i386/pxeldr/pxeldr.S
index ee1e18a..ee1e18a 100644
--- a/sys/boot/i386/pxeldr/pxeldr.S
+++ b/stand/i386/pxeldr/pxeldr.S
diff --git a/sys/boot/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile
index f0523df..f0523df 100644
--- a/sys/boot/i386/zfsboot/Makefile
+++ b/stand/i386/zfsboot/Makefile
diff --git a/sys/boot/i386/zfsboot/Makefile.depend b/stand/i386/zfsboot/Makefile.depend
index 63a43d8..63a43d8 100644
--- a/sys/boot/i386/zfsboot/Makefile.depend
+++ b/stand/i386/zfsboot/Makefile.depend
diff --git a/sys/boot/i386/zfsboot/zfsboot.8 b/stand/i386/zfsboot/zfsboot.8
index 6450939..6450939 100644
--- a/sys/boot/i386/zfsboot/zfsboot.8
+++ b/stand/i386/zfsboot/zfsboot.8
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c
index 88b5231..88b5231 100644
--- a/sys/boot/i386/zfsboot/zfsboot.c
+++ b/stand/i386/zfsboot/zfsboot.c
diff --git a/sys/boot/i386/zfsboot/zfsldr.S b/stand/i386/zfsboot/zfsldr.S
index 3e85e27..3e85e27 100644
--- a/sys/boot/i386/zfsboot/zfsldr.S
+++ b/stand/i386/zfsboot/zfsldr.S
diff --git a/sys/boot/i386/zfsloader/Makefile b/stand/i386/zfsloader/Makefile
index a9fa913..a9fa913 100644
--- a/sys/boot/i386/zfsloader/Makefile
+++ b/stand/i386/zfsloader/Makefile
diff --git a/sys/boot/i386/zfsloader/Makefile.depend b/stand/i386/zfsloader/Makefile.depend
index 15b0c98..15b0c98 100644
--- a/sys/boot/i386/zfsloader/Makefile.depend
+++ b/stand/i386/zfsloader/Makefile.depend
diff --git a/sys/boot/kshim/bsd_busspace.c b/stand/kshim/bsd_busspace.c
index 778c449..778c449 100644
--- a/sys/boot/kshim/bsd_busspace.c
+++ b/stand/kshim/bsd_busspace.c
diff --git a/sys/boot/kshim/bsd_global.h b/stand/kshim/bsd_global.h
index 63bba75..63bba75 100644
--- a/sys/boot/kshim/bsd_global.h
+++ b/stand/kshim/bsd_global.h
diff --git a/sys/boot/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c
index 75eccb1..75eccb1 100644
--- a/sys/boot/kshim/bsd_kernel.c
+++ b/stand/kshim/bsd_kernel.c
diff --git a/sys/boot/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
index 66106ac..66106ac 100644
--- a/sys/boot/kshim/bsd_kernel.h
+++ b/stand/kshim/bsd_kernel.h
diff --git a/sys/boot/kshim/kshim.mk b/stand/kshim/kshim.mk
index 7e9b00d..7e9b00d 100644
--- a/sys/boot/kshim/kshim.mk
+++ b/stand/kshim/kshim.mk
diff --git a/sys/boot/kshim/sysinit.h b/stand/kshim/sysinit.h
index a7a450e..a7a450e 100644
--- a/sys/boot/kshim/sysinit.h
+++ b/stand/kshim/sysinit.h
diff --git a/sys/boot/libsa/Makefile b/stand/libsa/Makefile
index ea32f3e..ea32f3e 100644
--- a/sys/boot/libsa/Makefile
+++ b/stand/libsa/Makefile
diff --git a/sys/boot/libsa/Makefile.depend b/stand/libsa/Makefile.depend
index 1d86fce..1d86fce 100644
--- a/sys/boot/libsa/Makefile.depend
+++ b/stand/libsa/Makefile.depend
diff --git a/sys/boot/libsa/__main.c b/stand/libsa/__main.c
index e38f338..e38f338 100644
--- a/sys/boot/libsa/__main.c
+++ b/stand/libsa/__main.c
diff --git a/sys/boot/libsa/amd64/_setjmp.S b/stand/libsa/amd64/_setjmp.S
index e841f49..e841f49 100644
--- a/sys/boot/libsa/amd64/_setjmp.S
+++ b/stand/libsa/amd64/_setjmp.S
diff --git a/sys/boot/libsa/arp.c b/stand/libsa/arp.c
index 61b5f1f..61b5f1f 100644
--- a/sys/boot/libsa/arp.c
+++ b/stand/libsa/arp.c
diff --git a/sys/boot/libsa/assert.c b/stand/libsa/assert.c
index 8eec63a..8eec63a 100644
--- a/sys/boot/libsa/assert.c
+++ b/stand/libsa/assert.c
diff --git a/sys/boot/libsa/bcd.c b/stand/libsa/bcd.c
index 7bd67c9..7bd67c9 100644
--- a/sys/boot/libsa/bcd.c
+++ b/stand/libsa/bcd.c
diff --git a/sys/boot/libsa/bootp.c b/stand/libsa/bootp.c
index 9f08faf..9f08faf 100644
--- a/sys/boot/libsa/bootp.c
+++ b/stand/libsa/bootp.c
diff --git a/sys/boot/libsa/bootp.h b/stand/libsa/bootp.h
index 2e7049b..2e7049b 100644
--- a/sys/boot/libsa/bootp.h
+++ b/stand/libsa/bootp.h
diff --git a/sys/boot/libsa/bootparam.c b/stand/libsa/bootparam.c
index 1de2d53..1de2d53 100644
--- a/sys/boot/libsa/bootparam.c
+++ b/stand/libsa/bootparam.c
diff --git a/sys/boot/libsa/bootparam.h b/stand/libsa/bootparam.h
index 6f0c773..6f0c773 100644
--- a/sys/boot/libsa/bootparam.h
+++ b/stand/libsa/bootparam.h
diff --git a/sys/boot/libsa/bzipfs.c b/stand/libsa/bzipfs.c
index ff1514e..ff1514e 100644
--- a/sys/boot/libsa/bzipfs.c
+++ b/stand/libsa/bzipfs.c
diff --git a/sys/boot/libsa/cd9660.c b/stand/libsa/cd9660.c
index c561883..c561883 100644
--- a/sys/boot/libsa/cd9660.c
+++ b/stand/libsa/cd9660.c
diff --git a/sys/boot/libsa/close.c b/stand/libsa/close.c
index 939f025..939f025 100644
--- a/sys/boot/libsa/close.c
+++ b/stand/libsa/close.c
diff --git a/sys/boot/libsa/closeall.c b/stand/libsa/closeall.c
index a661426..a661426 100644
--- a/sys/boot/libsa/closeall.c
+++ b/stand/libsa/closeall.c
diff --git a/sys/boot/libsa/crc32.c b/stand/libsa/crc32.c
index 1a3e3a3..1a3e3a3 100644
--- a/sys/boot/libsa/crc32.c
+++ b/stand/libsa/crc32.c
diff --git a/sys/boot/libsa/crc32.h b/stand/libsa/crc32.h
index adfd628..adfd628 100644
--- a/sys/boot/libsa/crc32.h
+++ b/stand/libsa/crc32.h
diff --git a/sys/boot/libsa/dev.c b/stand/libsa/dev.c
index 482c082..482c082 100644
--- a/sys/boot/libsa/dev.c
+++ b/stand/libsa/dev.c
diff --git a/sys/boot/libsa/dosfs.c b/stand/libsa/dosfs.c
index 6bbe961..6bbe961 100644
--- a/sys/boot/libsa/dosfs.c
+++ b/stand/libsa/dosfs.c
diff --git a/sys/boot/libsa/dosfs.h b/stand/libsa/dosfs.h
index 5b11e0f..5b11e0f 100644
--- a/sys/boot/libsa/dosfs.h
+++ b/stand/libsa/dosfs.h
diff --git a/sys/boot/libsa/environment.c b/stand/libsa/environment.c
index 83349f1..83349f1 100644
--- a/sys/boot/libsa/environment.c
+++ b/stand/libsa/environment.c
diff --git a/sys/boot/libsa/ether.c b/stand/libsa/ether.c
index 7ab9d74..7ab9d74 100644
--- a/sys/boot/libsa/ether.c
+++ b/stand/libsa/ether.c
diff --git a/sys/boot/libsa/ext2fs.c b/stand/libsa/ext2fs.c
index d0b91e0..d0b91e0 100644
--- a/sys/boot/libsa/ext2fs.c
+++ b/stand/libsa/ext2fs.c
diff --git a/sys/boot/libsa/fstat.c b/stand/libsa/fstat.c
index 13bed08..13bed08 100644
--- a/sys/boot/libsa/fstat.c
+++ b/stand/libsa/fstat.c
diff --git a/sys/boot/libsa/getopt.c b/stand/libsa/getopt.c
index cfe405a..cfe405a 100644
--- a/sys/boot/libsa/getopt.c
+++ b/stand/libsa/getopt.c
diff --git a/sys/boot/libsa/gets.c b/stand/libsa/gets.c
index 7d54b00..7d54b00 100644
--- a/sys/boot/libsa/gets.c
+++ b/stand/libsa/gets.c
diff --git a/sys/boot/libsa/globals.c b/stand/libsa/globals.c
index 8fb56cf..8fb56cf 100644
--- a/sys/boot/libsa/globals.c
+++ b/stand/libsa/globals.c
diff --git a/sys/boot/libsa/gpt.c b/stand/libsa/gpt.c
index 7ab3fc6..7ab3fc6 100644
--- a/sys/boot/libsa/gpt.c
+++ b/stand/libsa/gpt.c
diff --git a/sys/boot/libsa/gpt.h b/stand/libsa/gpt.h
index 9d48564..9d48564 100644
--- a/sys/boot/libsa/gpt.h
+++ b/stand/libsa/gpt.h
diff --git a/sys/boot/libsa/gzipfs.c b/stand/libsa/gzipfs.c
index 6057c28..6057c28 100644
--- a/sys/boot/libsa/gzipfs.c
+++ b/stand/libsa/gzipfs.c
diff --git a/sys/boot/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S
index cc9de5c..cc9de5c 100644
--- a/sys/boot/libsa/i386/_setjmp.S
+++ b/stand/libsa/i386/_setjmp.S
diff --git a/sys/boot/libsa/in_cksum.c b/stand/libsa/in_cksum.c
index e6051bf..e6051bf 100644
--- a/sys/boot/libsa/in_cksum.c
+++ b/stand/libsa/in_cksum.c
diff --git a/sys/boot/libsa/inet_ntoa.c b/stand/libsa/inet_ntoa.c
index 5bc8533..5bc8533 100644
--- a/sys/boot/libsa/inet_ntoa.c
+++ b/stand/libsa/inet_ntoa.c
diff --git a/sys/boot/libsa/ioctl.c b/stand/libsa/ioctl.c
index a4512af..a4512af 100644
--- a/sys/boot/libsa/ioctl.c
+++ b/stand/libsa/ioctl.c
diff --git a/sys/boot/libsa/iodesc.h b/stand/libsa/iodesc.h
index 0da1946..0da1946 100644
--- a/sys/boot/libsa/iodesc.h
+++ b/stand/libsa/iodesc.h
diff --git a/sys/boot/libsa/ip.c b/stand/libsa/ip.c
index f2293b3..f2293b3 100644
--- a/sys/boot/libsa/ip.c
+++ b/stand/libsa/ip.c
diff --git a/sys/boot/libsa/libstand.3 b/stand/libsa/libstand.3
index acb979f..acb979f 100644
--- a/sys/boot/libsa/libstand.3
+++ b/stand/libsa/libstand.3
diff --git a/sys/boot/libsa/lseek.c b/stand/libsa/lseek.c
index b9debd1..b9debd1 100644
--- a/sys/boot/libsa/lseek.c
+++ b/stand/libsa/lseek.c
diff --git a/sys/boot/libsa/mips/_setjmp.S b/stand/libsa/mips/_setjmp.S
index 0289b0e..0289b0e 100644
--- a/sys/boot/libsa/mips/_setjmp.S
+++ b/stand/libsa/mips/_setjmp.S
diff --git a/sys/boot/libsa/nandfs.c b/stand/libsa/nandfs.c
index fe3a8ab..fe3a8ab 100644
--- a/sys/boot/libsa/nandfs.c
+++ b/stand/libsa/nandfs.c
diff --git a/sys/boot/libsa/net.c b/stand/libsa/net.c
index 175ca5a..175ca5a 100644
--- a/sys/boot/libsa/net.c
+++ b/stand/libsa/net.c
diff --git a/sys/boot/libsa/net.h b/stand/libsa/net.h
index f91435c..f91435c 100644
--- a/sys/boot/libsa/net.h
+++ b/stand/libsa/net.h
diff --git a/sys/boot/libsa/netif.c b/stand/libsa/netif.c
index 105f9a3..105f9a3 100644
--- a/sys/boot/libsa/netif.c
+++ b/stand/libsa/netif.c
diff --git a/sys/boot/libsa/netif.h b/stand/libsa/netif.h
index 44165ab..44165ab 100644
--- a/sys/boot/libsa/netif.h
+++ b/stand/libsa/netif.h
diff --git a/sys/boot/libsa/nfs.c b/stand/libsa/nfs.c
index 7e2e1ab..7e2e1ab 100644
--- a/sys/boot/libsa/nfs.c
+++ b/stand/libsa/nfs.c
diff --git a/sys/boot/libsa/nfsv2.h b/stand/libsa/nfsv2.h
index 184a47b..184a47b 100644
--- a/sys/boot/libsa/nfsv2.h
+++ b/stand/libsa/nfsv2.h
diff --git a/sys/boot/libsa/nullfs.c b/stand/libsa/nullfs.c
index e4c0b7c..e4c0b7c 100644
--- a/sys/boot/libsa/nullfs.c
+++ b/stand/libsa/nullfs.c
diff --git a/sys/boot/libsa/open.c b/stand/libsa/open.c
index 214e51b..214e51b 100644
--- a/sys/boot/libsa/open.c
+++ b/stand/libsa/open.c
diff --git a/sys/boot/libsa/pager.c b/stand/libsa/pager.c
index a966b0b..a966b0b 100644
--- a/sys/boot/libsa/pager.c
+++ b/stand/libsa/pager.c
diff --git a/sys/boot/libsa/panic.c b/stand/libsa/panic.c
index 6e4c76d..6e4c76d 100644
--- a/sys/boot/libsa/panic.c
+++ b/stand/libsa/panic.c
diff --git a/sys/boot/libsa/pkgfs.c b/stand/libsa/pkgfs.c
index fda7f60..fda7f60 100644
--- a/sys/boot/libsa/pkgfs.c
+++ b/stand/libsa/pkgfs.c
diff --git a/sys/boot/libsa/powerpc/_setjmp.S b/stand/libsa/powerpc/_setjmp.S
index 7c7c24b..7c7c24b 100644
--- a/sys/boot/libsa/powerpc/_setjmp.S
+++ b/stand/libsa/powerpc/_setjmp.S
diff --git a/sys/boot/libsa/powerpc/syncicache.c b/stand/libsa/powerpc/syncicache.c
index 434dcec..434dcec 100644
--- a/sys/boot/libsa/powerpc/syncicache.c
+++ b/stand/libsa/powerpc/syncicache.c
diff --git a/sys/boot/libsa/printf.c b/stand/libsa/printf.c
index 71e313c..71e313c 100644
--- a/sys/boot/libsa/printf.c
+++ b/stand/libsa/printf.c
diff --git a/sys/boot/libsa/qdivrem.c b/stand/libsa/qdivrem.c
index bde3b0d..bde3b0d 100644
--- a/sys/boot/libsa/qdivrem.c
+++ b/stand/libsa/qdivrem.c
diff --git a/sys/boot/libsa/quad.h b/stand/libsa/quad.h
index 349540a..349540a 100644
--- a/sys/boot/libsa/quad.h
+++ b/stand/libsa/quad.h
diff --git a/sys/boot/libsa/random.c b/stand/libsa/random.c
index a5b2ad6..a5b2ad6 100644
--- a/sys/boot/libsa/random.c
+++ b/stand/libsa/random.c
diff --git a/sys/boot/libsa/rarp.c b/stand/libsa/rarp.c
index 3b8088e..3b8088e 100644
--- a/sys/boot/libsa/rarp.c
+++ b/stand/libsa/rarp.c
diff --git a/sys/boot/libsa/read.c b/stand/libsa/read.c
index c165d68..c165d68 100644
--- a/sys/boot/libsa/read.c
+++ b/stand/libsa/read.c
diff --git a/sys/boot/libsa/readdir.c b/stand/libsa/readdir.c
index e49d93d..e49d93d 100644
--- a/sys/boot/libsa/readdir.c
+++ b/stand/libsa/readdir.c
diff --git a/sys/boot/libsa/rpc.c b/stand/libsa/rpc.c
index 94e6ce6..94e6ce6 100644
--- a/sys/boot/libsa/rpc.c
+++ b/stand/libsa/rpc.c
diff --git a/sys/boot/libsa/rpc.h b/stand/libsa/rpc.h
index 6dda060..6dda060 100644
--- a/sys/boot/libsa/rpc.h
+++ b/stand/libsa/rpc.h
diff --git a/sys/boot/libsa/rpcv2.h b/stand/libsa/rpcv2.h
index b59a760..b59a760 100644
--- a/sys/boot/libsa/rpcv2.h
+++ b/stand/libsa/rpcv2.h
diff --git a/sys/boot/libsa/saioctl.h b/stand/libsa/saioctl.h
index 5f888ff..5f888ff 100644
--- a/sys/boot/libsa/saioctl.h
+++ b/stand/libsa/saioctl.h
diff --git a/sys/boot/libsa/sbrk.c b/stand/libsa/sbrk.c
index 471e78e..471e78e 100644
--- a/sys/boot/libsa/sbrk.c
+++ b/stand/libsa/sbrk.c
diff --git a/sys/boot/libsa/sparc64/_setjmp.S b/stand/libsa/sparc64/_setjmp.S
index 50c924e..50c924e 100644
--- a/sys/boot/libsa/sparc64/_setjmp.S
+++ b/stand/libsa/sparc64/_setjmp.S
diff --git a/sys/boot/libsa/splitfs.c b/stand/libsa/splitfs.c
index af28704..af28704 100644
--- a/sys/boot/libsa/splitfs.c
+++ b/stand/libsa/splitfs.c
diff --git a/sys/boot/libsa/stand.h b/stand/libsa/stand.h
index deb6ad8..deb6ad8 100644
--- a/sys/boot/libsa/stand.h
+++ b/stand/libsa/stand.h
diff --git a/sys/boot/libsa/stat.c b/stand/libsa/stat.c
index addee5d..addee5d 100644
--- a/sys/boot/libsa/stat.c
+++ b/stand/libsa/stat.c
diff --git a/sys/boot/libsa/strcasecmp.c b/stand/libsa/strcasecmp.c
index 7ef3f59..7ef3f59 100644
--- a/sys/boot/libsa/strcasecmp.c
+++ b/stand/libsa/strcasecmp.c
diff --git a/sys/boot/libsa/strdup.c b/stand/libsa/strdup.c
index 45a5414..45a5414 100644
--- a/sys/boot/libsa/strdup.c
+++ b/stand/libsa/strdup.c
diff --git a/sys/boot/libsa/strerror.c b/stand/libsa/strerror.c
index 56571ef..56571ef 100644
--- a/sys/boot/libsa/strerror.c
+++ b/stand/libsa/strerror.c
diff --git a/sys/boot/libsa/strtol.c b/stand/libsa/strtol.c
index be82fb1..be82fb1 100644
--- a/sys/boot/libsa/strtol.c
+++ b/stand/libsa/strtol.c
diff --git a/sys/boot/libsa/strtoul.c b/stand/libsa/strtoul.c
index 5735d20..5735d20 100644
--- a/sys/boot/libsa/strtoul.c
+++ b/stand/libsa/strtoul.c
diff --git a/sys/boot/libsa/tftp.c b/stand/libsa/tftp.c
index 9bef464..9bef464 100644
--- a/sys/boot/libsa/tftp.c
+++ b/stand/libsa/tftp.c
diff --git a/sys/boot/libsa/tftp.h b/stand/libsa/tftp.h
index cbbbbd7..cbbbbd7 100644
--- a/sys/boot/libsa/tftp.h
+++ b/stand/libsa/tftp.h
diff --git a/sys/boot/libsa/twiddle.c b/stand/libsa/twiddle.c
index 96ebbbe..96ebbbe 100644
--- a/sys/boot/libsa/twiddle.c
+++ b/stand/libsa/twiddle.c
diff --git a/sys/boot/libsa/udp.c b/stand/libsa/udp.c
index 8e52f29..8e52f29 100644
--- a/sys/boot/libsa/udp.c
+++ b/stand/libsa/udp.c
diff --git a/sys/boot/libsa/ufs.c b/stand/libsa/ufs.c
index 928a1d1..928a1d1 100644
--- a/sys/boot/libsa/ufs.c
+++ b/stand/libsa/ufs.c
diff --git a/sys/boot/libsa/ufsread.c b/stand/libsa/ufsread.c
index 5ba65a4..5ba65a4 100644
--- a/sys/boot/libsa/ufsread.c
+++ b/stand/libsa/ufsread.c
diff --git a/sys/boot/libsa/util.c b/stand/libsa/util.c
index 49f42eb..49f42eb 100644
--- a/sys/boot/libsa/util.c
+++ b/stand/libsa/util.c
diff --git a/sys/boot/libsa/util.h b/stand/libsa/util.h
index 88a99f1..88a99f1 100644
--- a/sys/boot/libsa/util.h
+++ b/stand/libsa/util.h
diff --git a/sys/boot/libsa/uuid_from_string.c b/stand/libsa/uuid_from_string.c
index 7a59b41..7a59b41 100644
--- a/sys/boot/libsa/uuid_from_string.c
+++ b/stand/libsa/uuid_from_string.c
diff --git a/sys/boot/libsa/uuid_to_string.c b/stand/libsa/uuid_to_string.c
index d878af4..d878af4 100644
--- a/sys/boot/libsa/uuid_to_string.c
+++ b/stand/libsa/uuid_to_string.c
diff --git a/sys/boot/libsa/write.c b/stand/libsa/write.c
index 9e02f08..9e02f08 100644
--- a/sys/boot/libsa/write.c
+++ b/stand/libsa/write.c
diff --git a/sys/boot/libsa/zalloc.c b/stand/libsa/zalloc.c
index 4d1ec62..4d1ec62 100644
--- a/sys/boot/libsa/zalloc.c
+++ b/stand/libsa/zalloc.c
diff --git a/sys/boot/libsa/zalloc_defs.h b/stand/libsa/zalloc_defs.h
index 7f2cc12..7f2cc12 100644
--- a/sys/boot/libsa/zalloc_defs.h
+++ b/stand/libsa/zalloc_defs.h
diff --git a/sys/boot/libsa/zalloc_malloc.c b/stand/libsa/zalloc_malloc.c
index b9a295f..b9a295f 100644
--- a/sys/boot/libsa/zalloc_malloc.c
+++ b/stand/libsa/zalloc_malloc.c
diff --git a/sys/boot/libsa/zalloc_mem.h b/stand/libsa/zalloc_mem.h
index 26d388d..26d388d 100644
--- a/sys/boot/libsa/zalloc_mem.h
+++ b/stand/libsa/zalloc_mem.h
diff --git a/sys/boot/libsa/zalloc_protos.h b/stand/libsa/zalloc_protos.h
index 53a40e4..53a40e4 100644
--- a/sys/boot/libsa/zalloc_protos.h
+++ b/stand/libsa/zalloc_protos.h
diff --git a/sys/boot/libsa32/Makefile b/stand/libsa32/Makefile
index eba6c00..eba6c00 100644
--- a/sys/boot/libsa32/Makefile
+++ b/stand/libsa32/Makefile
diff --git a/sys/boot/libsa32/Makefile.depend b/stand/libsa32/Makefile.depend
index 1d86fce..1d86fce 100644
--- a/sys/boot/libsa32/Makefile.depend
+++ b/stand/libsa32/Makefile.depend
diff --git a/sys/boot/loader.mk b/stand/loader.mk
index 66fc2ce..66fc2ce 100644
--- a/sys/boot/loader.mk
+++ b/stand/loader.mk
diff --git a/sys/boot/man/Makefile b/stand/man/Makefile
index 15285ac..15285ac 100644
--- a/sys/boot/man/Makefile
+++ b/stand/man/Makefile
diff --git a/sys/boot/man/loader.8 b/stand/man/loader.8
index 7af7343..7af7343 100644
--- a/sys/boot/man/loader.8
+++ b/stand/man/loader.8
diff --git a/sys/boot/man/zfsloader.8 b/stand/man/zfsloader.8
index fd437d9..fd437d9 100644
--- a/sys/boot/man/zfsloader.8
+++ b/stand/man/zfsloader.8
diff --git a/sys/boot/mips/Makefile b/stand/mips/Makefile
index 760c557..760c557 100644
--- a/sys/boot/mips/Makefile
+++ b/stand/mips/Makefile
diff --git a/sys/boot/mips/Makefile.inc b/stand/mips/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/mips/Makefile.inc
+++ b/stand/mips/Makefile.inc
diff --git a/sys/boot/mips/beri/Makefile b/stand/mips/beri/Makefile
index afcb538..afcb538 100644
--- a/sys/boot/mips/beri/Makefile
+++ b/stand/mips/beri/Makefile
diff --git a/sys/boot/mips/beri/Makefile.inc b/stand/mips/beri/Makefile.inc
index a12699c..a12699c 100644
--- a/sys/boot/mips/beri/Makefile.inc
+++ b/stand/mips/beri/Makefile.inc
diff --git a/sys/boot/mips/beri/boot2/Makefile b/stand/mips/beri/boot2/Makefile
index d369340..d369340 100644
--- a/sys/boot/mips/beri/boot2/Makefile
+++ b/stand/mips/beri/boot2/Makefile
diff --git a/sys/boot/mips/beri/boot2/boot2.c b/stand/mips/beri/boot2/boot2.c
index 3db33c4..3db33c4 100644
--- a/sys/boot/mips/beri/boot2/boot2.c
+++ b/stand/mips/beri/boot2/boot2.c
diff --git a/sys/boot/mips/beri/boot2/flashboot.ldscript b/stand/mips/beri/boot2/flashboot.ldscript
index 4d61438..4d61438 100644
--- a/sys/boot/mips/beri/boot2/flashboot.ldscript
+++ b/stand/mips/beri/boot2/flashboot.ldscript
diff --git a/sys/boot/mips/beri/boot2/jtagboot.ldscript b/stand/mips/beri/boot2/jtagboot.ldscript
index 064c6e1..064c6e1 100644
--- a/sys/boot/mips/beri/boot2/jtagboot.ldscript
+++ b/stand/mips/beri/boot2/jtagboot.ldscript
diff --git a/sys/boot/mips/beri/boot2/relocate.S b/stand/mips/beri/boot2/relocate.S
index d704eb5..d704eb5 100644
--- a/sys/boot/mips/beri/boot2/relocate.S
+++ b/stand/mips/beri/boot2/relocate.S
diff --git a/sys/boot/mips/beri/boot2/start.S b/stand/mips/beri/boot2/start.S
index c1fcce5..c1fcce5 100644
--- a/sys/boot/mips/beri/boot2/start.S
+++ b/stand/mips/beri/boot2/start.S
diff --git a/sys/boot/mips/beri/common/altera_jtag_uart.c b/stand/mips/beri/common/altera_jtag_uart.c
index 7edb451..7edb451 100644
--- a/sys/boot/mips/beri/common/altera_jtag_uart.c
+++ b/stand/mips/beri/common/altera_jtag_uart.c
diff --git a/sys/boot/mips/beri/common/beri.h b/stand/mips/beri/common/beri.h
index e6ccae8..e6ccae8 100644
--- a/sys/boot/mips/beri/common/beri.h
+++ b/stand/mips/beri/common/beri.h
diff --git a/sys/boot/mips/beri/common/cfi.c b/stand/mips/beri/common/cfi.c
index a6798f4..a6798f4 100644
--- a/sys/boot/mips/beri/common/cfi.c
+++ b/stand/mips/beri/common/cfi.c
diff --git a/sys/boot/mips/beri/common/cfi.h b/stand/mips/beri/common/cfi.h
index 3dfe48c..3dfe48c 100644
--- a/sys/boot/mips/beri/common/cfi.h
+++ b/stand/mips/beri/common/cfi.h
diff --git a/sys/boot/mips/beri/common/common.ldscript b/stand/mips/beri/common/common.ldscript
index 6266646..6266646 100644
--- a/sys/boot/mips/beri/common/common.ldscript
+++ b/stand/mips/beri/common/common.ldscript
diff --git a/sys/boot/mips/beri/common/cons.h b/stand/mips/beri/common/cons.h
index 18a466a..18a466a 100644
--- a/sys/boot/mips/beri/common/cons.h
+++ b/stand/mips/beri/common/cons.h
diff --git a/sys/boot/mips/beri/common/mips.h b/stand/mips/beri/common/mips.h
index c63d475..c63d475 100644
--- a/sys/boot/mips/beri/common/mips.h
+++ b/stand/mips/beri/common/mips.h
diff --git a/sys/boot/mips/beri/common/sdcard.c b/stand/mips/beri/common/sdcard.c
index e50f4e7..e50f4e7 100644
--- a/sys/boot/mips/beri/common/sdcard.c
+++ b/stand/mips/beri/common/sdcard.c
diff --git a/sys/boot/mips/beri/common/sdcard.h b/stand/mips/beri/common/sdcard.h
index 0eb7760..0eb7760 100644
--- a/sys/boot/mips/beri/common/sdcard.h
+++ b/stand/mips/beri/common/sdcard.h
diff --git a/sys/boot/mips/beri/loader/Makefile b/stand/mips/beri/loader/Makefile
index 763b3b3..763b3b3 100644
--- a/sys/boot/mips/beri/loader/Makefile
+++ b/stand/mips/beri/loader/Makefile
diff --git a/sys/boot/mips/beri/loader/arch.c b/stand/mips/beri/loader/arch.c
index 5ce8ede..5ce8ede 100644
--- a/sys/boot/mips/beri/loader/arch.c
+++ b/stand/mips/beri/loader/arch.c
diff --git a/sys/boot/mips/beri/loader/beri_console.c b/stand/mips/beri/loader/beri_console.c
index 9a4ae19..9a4ae19 100644
--- a/sys/boot/mips/beri/loader/beri_console.c
+++ b/stand/mips/beri/loader/beri_console.c
diff --git a/sys/boot/mips/beri/loader/beri_disk_cfi.c b/stand/mips/beri/loader/beri_disk_cfi.c
index a21947f..a21947f 100644
--- a/sys/boot/mips/beri/loader/beri_disk_cfi.c
+++ b/stand/mips/beri/loader/beri_disk_cfi.c
diff --git a/sys/boot/mips/beri/loader/beri_disk_sdcard.c b/stand/mips/beri/loader/beri_disk_sdcard.c
index 266fb4a..266fb4a 100644
--- a/sys/boot/mips/beri/loader/beri_disk_sdcard.c
+++ b/stand/mips/beri/loader/beri_disk_sdcard.c
diff --git a/sys/boot/mips/beri/loader/devicename.c b/stand/mips/beri/loader/devicename.c
index 4a2c273..4a2c273 100644
--- a/sys/boot/mips/beri/loader/devicename.c
+++ b/stand/mips/beri/loader/devicename.c
diff --git a/sys/boot/mips/beri/loader/exec.c b/stand/mips/beri/loader/exec.c
index 382b6a1..382b6a1 100644
--- a/sys/boot/mips/beri/loader/exec.c
+++ b/stand/mips/beri/loader/exec.c
diff --git a/sys/boot/mips/beri/loader/help.mips b/stand/mips/beri/loader/help.mips
index 5873eb0..5873eb0 100644
--- a/sys/boot/mips/beri/loader/help.mips
+++ b/stand/mips/beri/loader/help.mips
diff --git a/sys/boot/mips/beri/loader/loader.h b/stand/mips/beri/loader/loader.h
index e4152e7..e4152e7 100644
--- a/sys/boot/mips/beri/loader/loader.h
+++ b/stand/mips/beri/loader/loader.h
diff --git a/sys/boot/mips/beri/loader/loader.ldscript b/stand/mips/beri/loader/loader.ldscript
index deb4865..deb4865 100644
--- a/sys/boot/mips/beri/loader/loader.ldscript
+++ b/stand/mips/beri/loader/loader.ldscript
diff --git a/sys/boot/mips/beri/loader/main.c b/stand/mips/beri/loader/main.c
index 2d201d8..2d201d8 100644
--- a/sys/boot/mips/beri/loader/main.c
+++ b/stand/mips/beri/loader/main.c
diff --git a/sys/boot/mips/beri/loader/metadata.c b/stand/mips/beri/loader/metadata.c
index 0698cd1..0698cd1 100644
--- a/sys/boot/mips/beri/loader/metadata.c
+++ b/stand/mips/beri/loader/metadata.c
diff --git a/sys/boot/mips/beri/loader/start.S b/stand/mips/beri/loader/start.S
index d679caa..d679caa 100644
--- a/sys/boot/mips/beri/loader/start.S
+++ b/stand/mips/beri/loader/start.S
diff --git a/sys/boot/mips/beri/loader/version b/stand/mips/beri/loader/version
index ce8e187..ce8e187 100644
--- a/sys/boot/mips/beri/loader/version
+++ b/stand/mips/beri/loader/version
diff --git a/sys/boot/mips/uboot/Makefile b/stand/mips/uboot/Makefile
index b941ba3..b941ba3 100644
--- a/sys/boot/mips/uboot/Makefile
+++ b/stand/mips/uboot/Makefile
diff --git a/sys/boot/mips/uboot/conf.c b/stand/mips/uboot/conf.c
index 3579b6a..3579b6a 100644
--- a/sys/boot/mips/uboot/conf.c
+++ b/stand/mips/uboot/conf.c
diff --git a/sys/boot/mips/uboot/help.uboot b/stand/mips/uboot/help.uboot
index c1574af..c1574af 100644
--- a/sys/boot/mips/uboot/help.uboot
+++ b/stand/mips/uboot/help.uboot
diff --git a/sys/boot/mips/uboot/ldscript.mips b/stand/mips/uboot/ldscript.mips
index 815dabc..815dabc 100644
--- a/sys/boot/mips/uboot/ldscript.mips
+++ b/stand/mips/uboot/ldscript.mips
diff --git a/sys/boot/mips/uboot/loader.conf b/stand/mips/uboot/loader.conf
index dd2a23a..dd2a23a 100644
--- a/sys/boot/mips/uboot/loader.conf
+++ b/stand/mips/uboot/loader.conf
diff --git a/sys/boot/mips/uboot/start.S b/stand/mips/uboot/start.S
index 2ca68b2..2ca68b2 100644
--- a/sys/boot/mips/uboot/start.S
+++ b/stand/mips/uboot/start.S
diff --git a/sys/boot/mips/uboot/version b/stand/mips/uboot/version
index 486c412..486c412 100644
--- a/sys/boot/mips/uboot/version
+++ b/stand/mips/uboot/version
diff --git a/sys/boot/ofw/Makefile b/stand/ofw/Makefile
index 3b881b7..3b881b7 100644
--- a/sys/boot/ofw/Makefile
+++ b/stand/ofw/Makefile
diff --git a/sys/boot/ofw/Makefile.inc b/stand/ofw/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/ofw/Makefile.inc
+++ b/stand/ofw/Makefile.inc
diff --git a/sys/boot/ofw/common/Makefile.inc b/stand/ofw/common/Makefile.inc
index 5d20372..5d20372 100644
--- a/sys/boot/ofw/common/Makefile.inc
+++ b/stand/ofw/common/Makefile.inc
diff --git a/sys/boot/ofw/common/main.c b/stand/ofw/common/main.c
index 3c0bbdf..3c0bbdf 100644
--- a/sys/boot/ofw/common/main.c
+++ b/stand/ofw/common/main.c
diff --git a/sys/boot/ofw/libofw/Makefile b/stand/ofw/libofw/Makefile
index 8e9ac80..8e9ac80 100644
--- a/sys/boot/ofw/libofw/Makefile
+++ b/stand/ofw/libofw/Makefile
diff --git a/sys/boot/ofw/libofw/devicename.c b/stand/ofw/libofw/devicename.c
index c9814b7..c9814b7 100644
--- a/sys/boot/ofw/libofw/devicename.c
+++ b/stand/ofw/libofw/devicename.c
diff --git a/sys/boot/ofw/libofw/elf_freebsd.c b/stand/ofw/libofw/elf_freebsd.c
index 80ece7e..80ece7e 100644
--- a/sys/boot/ofw/libofw/elf_freebsd.c
+++ b/stand/ofw/libofw/elf_freebsd.c
diff --git a/sys/boot/ofw/libofw/libofw.h b/stand/ofw/libofw/libofw.h
index 87e9095..87e9095 100644
--- a/sys/boot/ofw/libofw/libofw.h
+++ b/stand/ofw/libofw/libofw.h
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/stand/ofw/libofw/ofw_console.c
index 59ce9a5..59ce9a5 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/stand/ofw/libofw/ofw_console.c
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/stand/ofw/libofw/ofw_copy.c
index ffd6987..ffd6987 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/stand/ofw/libofw/ofw_copy.c
diff --git a/sys/boot/ofw/libofw/ofw_disk.c b/stand/ofw/libofw/ofw_disk.c
index 2c3bd56..2c3bd56 100644
--- a/sys/boot/ofw/libofw/ofw_disk.c
+++ b/stand/ofw/libofw/ofw_disk.c
diff --git a/sys/boot/ofw/libofw/ofw_memory.c b/stand/ofw/libofw/ofw_memory.c
index 5616184..5616184 100644
--- a/sys/boot/ofw/libofw/ofw_memory.c
+++ b/stand/ofw/libofw/ofw_memory.c
diff --git a/sys/boot/ofw/libofw/ofw_module.c b/stand/ofw/libofw/ofw_module.c
index d39a343..d39a343 100644
--- a/sys/boot/ofw/libofw/ofw_module.c
+++ b/stand/ofw/libofw/ofw_module.c
diff --git a/sys/boot/ofw/libofw/ofw_net.c b/stand/ofw/libofw/ofw_net.c
index ea5e47e..ea5e47e 100644
--- a/sys/boot/ofw/libofw/ofw_net.c
+++ b/stand/ofw/libofw/ofw_net.c
diff --git a/sys/boot/ofw/libofw/ofw_reboot.c b/stand/ofw/libofw/ofw_reboot.c
index bbb420a..bbb420a 100644
--- a/sys/boot/ofw/libofw/ofw_reboot.c
+++ b/stand/ofw/libofw/ofw_reboot.c
diff --git a/sys/boot/ofw/libofw/ofw_time.c b/stand/ofw/libofw/ofw_time.c
index d5ca271..d5ca271 100644
--- a/sys/boot/ofw/libofw/ofw_time.c
+++ b/stand/ofw/libofw/ofw_time.c
diff --git a/sys/boot/ofw/libofw/openfirm.c b/stand/ofw/libofw/openfirm.c
index 1ccae60..1ccae60 100644
--- a/sys/boot/ofw/libofw/openfirm.c
+++ b/stand/ofw/libofw/openfirm.c
diff --git a/sys/boot/ofw/libofw/openfirm.h b/stand/ofw/libofw/openfirm.h
index 9fe77c6..9fe77c6 100644
--- a/sys/boot/ofw/libofw/openfirm.h
+++ b/stand/ofw/libofw/openfirm.h
diff --git a/sys/boot/ofw/libofw/ppc64_elf_freebsd.c b/stand/ofw/libofw/ppc64_elf_freebsd.c
index b411da4..b411da4 100644
--- a/sys/boot/ofw/libofw/ppc64_elf_freebsd.c
+++ b/stand/ofw/libofw/ppc64_elf_freebsd.c
diff --git a/sys/boot/pc98/Makefile b/stand/pc98/Makefile
index e8f9dbf..e8f9dbf 100644
--- a/sys/boot/pc98/Makefile
+++ b/stand/pc98/Makefile
diff --git a/sys/boot/pc98/Makefile.inc b/stand/pc98/Makefile.inc
index 829793d..d766303 100644
--- a/sys/boot/pc98/Makefile.inc
+++ b/stand/pc98/Makefile.inc
@@ -1,4 +1,4 @@
-# Common defines for all of /sys/boot/pc98/
+# Common defines for all of /stand/pc98/
 #
 # $FreeBSD$
 
@@ -22,7 +22,7 @@ BTXKERN=	${BTXDIR}/btx/btx
 BTXCRT=		${BTXDIR}/lib/crt0.o
 
 # compact binary with no padding between text, data, bss
-LDSCRIPT=	${SRCTOP}/sys/boot/i386/boot.ldscript
+LDSCRIPT=	${SRCTOP}/stand/i386/boot.ldscript
 LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary
 LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections
 
diff --git a/sys/boot/pc98/boot0.5/Makefile b/stand/pc98/boot0.5/Makefile
index ec40fe5..ec40fe5 100644
--- a/sys/boot/pc98/boot0.5/Makefile
+++ b/stand/pc98/boot0.5/Makefile
diff --git a/sys/boot/pc98/boot0.5/boot.s b/stand/pc98/boot0.5/boot.s
index 9d11206..9d11206 100644
--- a/sys/boot/pc98/boot0.5/boot.s
+++ b/stand/pc98/boot0.5/boot.s
diff --git a/sys/boot/pc98/boot0.5/boot0.5.s b/stand/pc98/boot0.5/boot0.5.s
index f878006..f878006 100644
--- a/sys/boot/pc98/boot0.5/boot0.5.s
+++ b/stand/pc98/boot0.5/boot0.5.s
diff --git a/sys/boot/pc98/boot0.5/disk.s b/stand/pc98/boot0.5/disk.s
index 6e80348..6e80348 100644
--- a/sys/boot/pc98/boot0.5/disk.s
+++ b/stand/pc98/boot0.5/disk.s
diff --git a/sys/boot/pc98/boot0.5/ldscript b/stand/pc98/boot0.5/ldscript
index 49044ab..49044ab 100644
--- a/sys/boot/pc98/boot0.5/ldscript
+++ b/stand/pc98/boot0.5/ldscript
diff --git a/sys/boot/pc98/boot0.5/putssjis.s b/stand/pc98/boot0.5/putssjis.s
index 221b9e6..221b9e6 100644
--- a/sys/boot/pc98/boot0.5/putssjis.s
+++ b/stand/pc98/boot0.5/putssjis.s
diff --git a/sys/boot/pc98/boot0.5/selector.s b/stand/pc98/boot0.5/selector.s
index 9d98ef8..9d98ef8 100644
--- a/sys/boot/pc98/boot0.5/selector.s
+++ b/stand/pc98/boot0.5/selector.s
diff --git a/sys/boot/pc98/boot0.5/start.s b/stand/pc98/boot0.5/start.s
index 008ae66..008ae66 100644
--- a/sys/boot/pc98/boot0.5/start.s
+++ b/stand/pc98/boot0.5/start.s
diff --git a/sys/boot/pc98/boot0.5/support.s b/stand/pc98/boot0.5/support.s
index df1115b..df1115b 100644
--- a/sys/boot/pc98/boot0.5/support.s
+++ b/stand/pc98/boot0.5/support.s
diff --git a/sys/boot/pc98/boot0.5/syscons.s b/stand/pc98/boot0.5/syscons.s
index 150b835..150b835 100644
--- a/sys/boot/pc98/boot0.5/syscons.s
+++ b/stand/pc98/boot0.5/syscons.s
diff --git a/sys/boot/pc98/boot0/Makefile b/stand/pc98/boot0/Makefile
index d348f60..d348f60 100644
--- a/sys/boot/pc98/boot0/Makefile
+++ b/stand/pc98/boot0/Makefile
diff --git a/sys/boot/pc98/boot0/boot0.s b/stand/pc98/boot0/boot0.s
index 508e252..508e252 100644
--- a/sys/boot/pc98/boot0/boot0.s
+++ b/stand/pc98/boot0/boot0.s
diff --git a/sys/boot/pc98/boot2/Makefile b/stand/pc98/boot2/Makefile
index 2db0590..2db0590 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/stand/pc98/boot2/Makefile
diff --git a/sys/boot/pc98/boot2/boot1.S b/stand/pc98/boot2/boot1.S
index 5c97206..5c97206 100644
--- a/sys/boot/pc98/boot2/boot1.S
+++ b/stand/pc98/boot2/boot1.S
diff --git a/sys/boot/pc98/boot2/boot2.c b/stand/pc98/boot2/boot2.c
index b582516..b582516 100644
--- a/sys/boot/pc98/boot2/boot2.c
+++ b/stand/pc98/boot2/boot2.c
diff --git a/sys/boot/pc98/btx/Makefile b/stand/pc98/btx/Makefile
index 39f78ed..39f78ed 100644
--- a/sys/boot/pc98/btx/Makefile
+++ b/stand/pc98/btx/Makefile
diff --git a/sys/boot/pc98/btx/Makefile.inc b/stand/pc98/btx/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/pc98/btx/Makefile.inc
+++ b/stand/pc98/btx/Makefile.inc
diff --git a/sys/boot/pc98/btx/btx/Makefile b/stand/pc98/btx/btx/Makefile
index 2755460..2755460 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/stand/pc98/btx/btx/Makefile
diff --git a/sys/boot/pc98/btx/btx/btx.S b/stand/pc98/btx/btx/btx.S
index e8710d3..e8710d3 100644
--- a/sys/boot/pc98/btx/btx/btx.S
+++ b/stand/pc98/btx/btx/btx.S
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/stand/pc98/btx/btxldr/Makefile
index 47e83a0..47e83a0 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/stand/pc98/btx/btxldr/Makefile
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.S b/stand/pc98/btx/btxldr/btxldr.S
index 9a6483f..9a6483f 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.S
+++ b/stand/pc98/btx/btxldr/btxldr.S
diff --git a/sys/boot/pc98/btx/lib/Makefile b/stand/pc98/btx/lib/Makefile
index e5876bc..e5876bc 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/stand/pc98/btx/lib/Makefile
diff --git a/sys/boot/pc98/btx/lib/btxcsu.S b/stand/pc98/btx/lib/btxcsu.S
index c46f809..c46f809 100644
--- a/sys/boot/pc98/btx/lib/btxcsu.S
+++ b/stand/pc98/btx/lib/btxcsu.S
diff --git a/sys/boot/pc98/btx/lib/btxsys.s b/stand/pc98/btx/lib/btxsys.s
index 9c77b42..9c77b42 100644
--- a/sys/boot/pc98/btx/lib/btxsys.s
+++ b/stand/pc98/btx/lib/btxsys.s
diff --git a/sys/boot/pc98/btx/lib/btxv86.h b/stand/pc98/btx/lib/btxv86.h
index 27f6b34..27f6b34 100644
--- a/sys/boot/pc98/btx/lib/btxv86.h
+++ b/stand/pc98/btx/lib/btxv86.h
diff --git a/sys/boot/pc98/btx/lib/btxv86.s b/stand/pc98/btx/lib/btxv86.s
index 0d7d111..0d7d111 100644
--- a/sys/boot/pc98/btx/lib/btxv86.s
+++ b/stand/pc98/btx/lib/btxv86.s
diff --git a/sys/boot/pc98/cdboot/Makefile b/stand/pc98/cdboot/Makefile
index ba94111..ba94111 100644
--- a/sys/boot/pc98/cdboot/Makefile
+++ b/stand/pc98/cdboot/Makefile
diff --git a/sys/boot/pc98/cdboot/cdboot.S b/stand/pc98/cdboot/cdboot.S
index c97c02b..c97c02b 100644
--- a/sys/boot/pc98/cdboot/cdboot.S
+++ b/stand/pc98/cdboot/cdboot.S
diff --git a/sys/boot/pc98/kgzldr/Makefile b/stand/pc98/kgzldr/Makefile
index 0070d70..0070d70 100644
--- a/sys/boot/pc98/kgzldr/Makefile
+++ b/stand/pc98/kgzldr/Makefile
diff --git a/sys/boot/pc98/kgzldr/crt.s b/stand/pc98/kgzldr/crt.s
index 35c1fc2..35c1fc2 100644
--- a/sys/boot/pc98/kgzldr/crt.s
+++ b/stand/pc98/kgzldr/crt.s
diff --git a/sys/boot/pc98/libpc98/Makefile b/stand/pc98/libpc98/Makefile
index f3e27a4..f3e27a4 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/stand/pc98/libpc98/Makefile
diff --git a/sys/boot/pc98/libpc98/bioscd.c b/stand/pc98/libpc98/bioscd.c
index f259701..f259701 100644
--- a/sys/boot/pc98/libpc98/bioscd.c
+++ b/stand/pc98/libpc98/bioscd.c
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/stand/pc98/libpc98/biosdisk.c
index 86a550d..86a550d 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/stand/pc98/libpc98/biosdisk.c
diff --git a/sys/boot/pc98/libpc98/biosmem.c b/stand/pc98/libpc98/biosmem.c
index c5a9b30..c5a9b30 100644
--- a/sys/boot/pc98/libpc98/biosmem.c
+++ b/stand/pc98/libpc98/biosmem.c
diff --git a/sys/boot/pc98/libpc98/biossmap.c b/stand/pc98/libpc98/biossmap.c
index 5a7a89f..5a7a89f 100644
--- a/sys/boot/pc98/libpc98/biossmap.c
+++ b/stand/pc98/libpc98/biossmap.c
diff --git a/sys/boot/pc98/libpc98/comconsole.c b/stand/pc98/libpc98/comconsole.c
index 1bf2d6a..1bf2d6a 100644
--- a/sys/boot/pc98/libpc98/comconsole.c
+++ b/stand/pc98/libpc98/comconsole.c
diff --git a/sys/boot/pc98/libpc98/libpc98.h b/stand/pc98/libpc98/libpc98.h
index 78b07a1..78b07a1 100644
--- a/sys/boot/pc98/libpc98/libpc98.h
+++ b/stand/pc98/libpc98/libpc98.h
diff --git a/sys/boot/pc98/libpc98/pc98_sys.c b/stand/pc98/libpc98/pc98_sys.c
index 7f66d02..7f66d02 100644
--- a/sys/boot/pc98/libpc98/pc98_sys.c
+++ b/stand/pc98/libpc98/pc98_sys.c
diff --git a/sys/boot/pc98/libpc98/time.c b/stand/pc98/libpc98/time.c
index 5d832bb..5d832bb 100644
--- a/sys/boot/pc98/libpc98/time.c
+++ b/stand/pc98/libpc98/time.c
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/stand/pc98/libpc98/vidconsole.c
index 7cf81e8..7cf81e8 100644
--- a/sys/boot/pc98/libpc98/vidconsole.c
+++ b/stand/pc98/libpc98/vidconsole.c
diff --git a/sys/boot/pc98/loader/Makefile b/stand/pc98/loader/Makefile
index d75e8d0..d75e8d0 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/stand/pc98/loader/Makefile
diff --git a/sys/boot/pc98/loader/conf.c b/stand/pc98/loader/conf.c
index 695c260..695c260 100644
--- a/sys/boot/pc98/loader/conf.c
+++ b/stand/pc98/loader/conf.c
diff --git a/sys/boot/pc98/loader/help.pc98 b/stand/pc98/loader/help.pc98
index 4b9197c..4b9197c 100644
--- a/sys/boot/pc98/loader/help.pc98
+++ b/stand/pc98/loader/help.pc98
diff --git a/sys/boot/pc98/loader/main.c b/stand/pc98/loader/main.c
index c31cc84..c31cc84 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/stand/pc98/loader/main.c
diff --git a/sys/boot/pc98/pc98boot/Makefile b/stand/pc98/pc98boot/Makefile
index f33b15f..f33b15f 100644
--- a/sys/boot/pc98/pc98boot/Makefile
+++ b/stand/pc98/pc98boot/Makefile
diff --git a/sys/boot/powerpc/Makefile b/stand/powerpc/Makefile
index 969eee8..969eee8 100644
--- a/sys/boot/powerpc/Makefile
+++ b/stand/powerpc/Makefile
diff --git a/sys/boot/powerpc/Makefile.inc b/stand/powerpc/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/powerpc/Makefile.inc
+++ b/stand/powerpc/Makefile.inc
diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile
index 384d0ab..384d0ab 100644
--- a/sys/boot/powerpc/boot1.chrp/Makefile
+++ b/stand/powerpc/boot1.chrp/Makefile
diff --git a/sys/boot/powerpc/boot1.chrp/Makefile.hfs b/stand/powerpc/boot1.chrp/Makefile.hfs
index c6c2d86..c6c2d86 100644
--- a/sys/boot/powerpc/boot1.chrp/Makefile.hfs
+++ b/stand/powerpc/boot1.chrp/Makefile.hfs
diff --git a/sys/boot/powerpc/boot1.chrp/boot1.c b/stand/powerpc/boot1.chrp/boot1.c
index 8de8e9f..8de8e9f 100644
--- a/sys/boot/powerpc/boot1.chrp/boot1.c
+++ b/stand/powerpc/boot1.chrp/boot1.c
diff --git a/sys/boot/powerpc/boot1.chrp/bootinfo.txt b/stand/powerpc/boot1.chrp/bootinfo.txt
index 61cf007..61cf007 100644
--- a/sys/boot/powerpc/boot1.chrp/bootinfo.txt
+++ b/stand/powerpc/boot1.chrp/bootinfo.txt
diff --git a/sys/boot/powerpc/boot1.chrp/generate-hfs.sh b/stand/powerpc/boot1.chrp/generate-hfs.sh
index ef368d1..ef368d1 100755
--- a/sys/boot/powerpc/boot1.chrp/generate-hfs.sh
+++ b/stand/powerpc/boot1.chrp/generate-hfs.sh
diff --git a/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu b/stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
index 20b7695..20b7695 100644
--- a/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
+++ b/stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu
diff --git a/sys/boot/powerpc/kboot/Makefile b/stand/powerpc/kboot/Makefile
index bed586e..bed586e 100644
--- a/sys/boot/powerpc/kboot/Makefile
+++ b/stand/powerpc/kboot/Makefile
diff --git a/sys/boot/powerpc/kboot/conf.c b/stand/powerpc/kboot/conf.c
index 104dd93..104dd93 100644
--- a/sys/boot/powerpc/kboot/conf.c
+++ b/stand/powerpc/kboot/conf.c
diff --git a/sys/boot/powerpc/kboot/host_syscall.S b/stand/powerpc/kboot/host_syscall.S
index 3607fdb..3607fdb 100644
--- a/sys/boot/powerpc/kboot/host_syscall.S
+++ b/stand/powerpc/kboot/host_syscall.S
diff --git a/sys/boot/powerpc/kboot/host_syscall.h b/stand/powerpc/kboot/host_syscall.h
index 0d47bd5..0d47bd5 100644
--- a/sys/boot/powerpc/kboot/host_syscall.h
+++ b/stand/powerpc/kboot/host_syscall.h
diff --git a/sys/boot/powerpc/kboot/hostcons.c b/stand/powerpc/kboot/hostcons.c
index 31dceb0..31dceb0 100644
--- a/sys/boot/powerpc/kboot/hostcons.c
+++ b/stand/powerpc/kboot/hostcons.c
diff --git a/sys/boot/powerpc/kboot/hostdisk.c b/stand/powerpc/kboot/hostdisk.c
index 22f5406..22f5406 100644
--- a/sys/boot/powerpc/kboot/hostdisk.c
+++ b/stand/powerpc/kboot/hostdisk.c
diff --git a/sys/boot/powerpc/kboot/kbootfdt.c b/stand/powerpc/kboot/kbootfdt.c
index 5ab3c3d..5ab3c3d 100644
--- a/sys/boot/powerpc/kboot/kbootfdt.c
+++ b/stand/powerpc/kboot/kbootfdt.c
diff --git a/sys/boot/powerpc/kboot/kerneltramp.S b/stand/powerpc/kboot/kerneltramp.S
index a394c95..a394c95 100644
--- a/sys/boot/powerpc/kboot/kerneltramp.S
+++ b/stand/powerpc/kboot/kerneltramp.S
diff --git a/sys/boot/powerpc/kboot/ldscript.powerpc b/stand/powerpc/kboot/ldscript.powerpc
index 7291136..7291136 100644
--- a/sys/boot/powerpc/kboot/ldscript.powerpc
+++ b/stand/powerpc/kboot/ldscript.powerpc
diff --git a/sys/boot/powerpc/kboot/main.c b/stand/powerpc/kboot/main.c
index 7a24c16..7a24c16 100644
--- a/sys/boot/powerpc/kboot/main.c
+++ b/stand/powerpc/kboot/main.c
diff --git a/sys/boot/powerpc/kboot/metadata.c b/stand/powerpc/kboot/metadata.c
index 1e8c314..1e8c314 100644
--- a/sys/boot/powerpc/kboot/metadata.c
+++ b/stand/powerpc/kboot/metadata.c
diff --git a/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c b/stand/powerpc/kboot/ppc64_elf_freebsd.c
index 22fa7b5..22fa7b5 100644
--- a/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c
+++ b/stand/powerpc/kboot/ppc64_elf_freebsd.c
diff --git a/sys/boot/powerpc/kboot/version b/stand/powerpc/kboot/version
index b24d6ea8..b24d6ea8 100644
--- a/sys/boot/powerpc/kboot/version
+++ b/stand/powerpc/kboot/version
diff --git a/sys/boot/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile
index 1853b25..1853b25 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/stand/powerpc/ofw/Makefile
diff --git a/sys/boot/powerpc/ofw/conf.c b/stand/powerpc/ofw/conf.c
index 7cad372..7cad372 100644
--- a/sys/boot/powerpc/ofw/conf.c
+++ b/stand/powerpc/ofw/conf.c
diff --git a/sys/boot/powerpc/ofw/ldscript.powerpc b/stand/powerpc/ofw/ldscript.powerpc
index 3a27650..3a27650 100644
--- a/sys/boot/powerpc/ofw/ldscript.powerpc
+++ b/stand/powerpc/ofw/ldscript.powerpc
diff --git a/sys/boot/powerpc/ofw/metadata.c b/stand/powerpc/ofw/metadata.c
index 25d51f8..25d51f8 100644
--- a/sys/boot/powerpc/ofw/metadata.c
+++ b/stand/powerpc/ofw/metadata.c
diff --git a/sys/boot/powerpc/ofw/ofwfdt.c b/stand/powerpc/ofw/ofwfdt.c
index 02f9939..02f9939 100644
--- a/sys/boot/powerpc/ofw/ofwfdt.c
+++ b/stand/powerpc/ofw/ofwfdt.c
diff --git a/sys/boot/powerpc/ofw/start.c b/stand/powerpc/ofw/start.c
index 911a2ec..911a2ec 100644
--- a/sys/boot/powerpc/ofw/start.c
+++ b/stand/powerpc/ofw/start.c
diff --git a/sys/boot/powerpc/ofw/version b/stand/powerpc/ofw/version
index cb0f693..cb0f693 100644
--- a/sys/boot/powerpc/ofw/version
+++ b/stand/powerpc/ofw/version
diff --git a/sys/boot/powerpc/ps3/Makefile b/stand/powerpc/ps3/Makefile
index 07ad135..07ad135 100644
--- a/sys/boot/powerpc/ps3/Makefile
+++ b/stand/powerpc/ps3/Makefile
diff --git a/sys/boot/powerpc/ps3/conf.c b/stand/powerpc/ps3/conf.c
index 3a5ae4c..3a5ae4c 100644
--- a/sys/boot/powerpc/ps3/conf.c
+++ b/stand/powerpc/ps3/conf.c
diff --git a/sys/boot/powerpc/ps3/devicename.c b/stand/powerpc/ps3/devicename.c
index 041f853..041f853 100644
--- a/sys/boot/powerpc/ps3/devicename.c
+++ b/stand/powerpc/ps3/devicename.c
diff --git a/sys/boot/powerpc/ps3/ldscript.powerpc b/stand/powerpc/ps3/ldscript.powerpc
index 12f3e75..12f3e75 100644
--- a/sys/boot/powerpc/ps3/ldscript.powerpc
+++ b/stand/powerpc/ps3/ldscript.powerpc
diff --git a/sys/boot/powerpc/ps3/lv1call.S b/stand/powerpc/ps3/lv1call.S
index a399a9c..a399a9c 100644
--- a/sys/boot/powerpc/ps3/lv1call.S
+++ b/stand/powerpc/ps3/lv1call.S
diff --git a/sys/boot/powerpc/ps3/lv1call.h b/stand/powerpc/ps3/lv1call.h
index fb80448..fb80448 100644
--- a/sys/boot/powerpc/ps3/lv1call.h
+++ b/stand/powerpc/ps3/lv1call.h
diff --git a/sys/boot/powerpc/ps3/main.c b/stand/powerpc/ps3/main.c
index be8708a..be8708a 100644
--- a/sys/boot/powerpc/ps3/main.c
+++ b/stand/powerpc/ps3/main.c
diff --git a/sys/boot/powerpc/ps3/metadata.c b/stand/powerpc/ps3/metadata.c
index 6f29c57..6f29c57 100644
--- a/sys/boot/powerpc/ps3/metadata.c
+++ b/stand/powerpc/ps3/metadata.c
diff --git a/sys/boot/powerpc/ps3/ppc64_elf_freebsd.c b/stand/powerpc/ps3/ppc64_elf_freebsd.c
index 3eb991e..3eb991e 100644
--- a/sys/boot/powerpc/ps3/ppc64_elf_freebsd.c
+++ b/stand/powerpc/ps3/ppc64_elf_freebsd.c
diff --git a/sys/boot/powerpc/ps3/ps3.h b/stand/powerpc/ps3/ps3.h
index 1a77002..1a77002 100644
--- a/sys/boot/powerpc/ps3/ps3.h
+++ b/stand/powerpc/ps3/ps3.h
diff --git a/sys/boot/powerpc/ps3/ps3bus.h b/stand/powerpc/ps3/ps3bus.h
index a3b20f3..a3b20f3 100644
--- a/sys/boot/powerpc/ps3/ps3bus.h
+++ b/stand/powerpc/ps3/ps3bus.h
diff --git a/sys/boot/powerpc/ps3/ps3cdrom.c b/stand/powerpc/ps3/ps3cdrom.c
index d8d41fd..d8d41fd 100644
--- a/sys/boot/powerpc/ps3/ps3cdrom.c
+++ b/stand/powerpc/ps3/ps3cdrom.c
diff --git a/sys/boot/powerpc/ps3/ps3cons.c b/stand/powerpc/ps3/ps3cons.c
index fa9ef32..fa9ef32 100644
--- a/sys/boot/powerpc/ps3/ps3cons.c
+++ b/stand/powerpc/ps3/ps3cons.c
diff --git a/sys/boot/powerpc/ps3/ps3devdesc.h b/stand/powerpc/ps3/ps3devdesc.h
index 5a6e52f..5a6e52f 100644
--- a/sys/boot/powerpc/ps3/ps3devdesc.h
+++ b/stand/powerpc/ps3/ps3devdesc.h
diff --git a/sys/boot/powerpc/ps3/ps3disk.c b/stand/powerpc/ps3/ps3disk.c
index c33a023..c33a023 100644
--- a/sys/boot/powerpc/ps3/ps3disk.c
+++ b/stand/powerpc/ps3/ps3disk.c
diff --git a/sys/boot/powerpc/ps3/ps3mmu.c b/stand/powerpc/ps3/ps3mmu.c
index 08dcf75..08dcf75 100644
--- a/sys/boot/powerpc/ps3/ps3mmu.c
+++ b/stand/powerpc/ps3/ps3mmu.c
diff --git a/sys/boot/powerpc/ps3/ps3net.c b/stand/powerpc/ps3/ps3net.c
index 142eab8..142eab8 100644
--- a/sys/boot/powerpc/ps3/ps3net.c
+++ b/stand/powerpc/ps3/ps3net.c
diff --git a/sys/boot/powerpc/ps3/ps3repo.c b/stand/powerpc/ps3/ps3repo.c
index 0064769..0064769 100644
--- a/sys/boot/powerpc/ps3/ps3repo.c
+++ b/stand/powerpc/ps3/ps3repo.c
diff --git a/sys/boot/powerpc/ps3/ps3repo.h b/stand/powerpc/ps3/ps3repo.h
index 68001df..68001df 100644
--- a/sys/boot/powerpc/ps3/ps3repo.h
+++ b/stand/powerpc/ps3/ps3repo.h
diff --git a/sys/boot/powerpc/ps3/ps3stor.c b/stand/powerpc/ps3/ps3stor.c
index bbfc56a..bbfc56a 100644
--- a/sys/boot/powerpc/ps3/ps3stor.c
+++ b/stand/powerpc/ps3/ps3stor.c
diff --git a/sys/boot/powerpc/ps3/ps3stor.h b/stand/powerpc/ps3/ps3stor.h
index 350b716..350b716 100644
--- a/sys/boot/powerpc/ps3/ps3stor.h
+++ b/stand/powerpc/ps3/ps3stor.h
diff --git a/sys/boot/powerpc/ps3/start.S b/stand/powerpc/ps3/start.S
index 570b3f5..570b3f5 100644
--- a/sys/boot/powerpc/ps3/start.S
+++ b/stand/powerpc/ps3/start.S
diff --git a/sys/boot/powerpc/ps3/version b/stand/powerpc/ps3/version
index fdac54e..fdac54e 100644
--- a/sys/boot/powerpc/ps3/version
+++ b/stand/powerpc/ps3/version
diff --git a/sys/boot/powerpc/uboot/Makefile b/stand/powerpc/uboot/Makefile
index d543ace..d543ace 100644
--- a/sys/boot/powerpc/uboot/Makefile
+++ b/stand/powerpc/uboot/Makefile
diff --git a/sys/boot/powerpc/uboot/conf.c b/stand/powerpc/uboot/conf.c
index 561238d..561238d 100644
--- a/sys/boot/powerpc/uboot/conf.c
+++ b/stand/powerpc/uboot/conf.c
diff --git a/sys/boot/powerpc/uboot/ldscript.powerpc b/stand/powerpc/uboot/ldscript.powerpc
index 9238383..9238383 100644
--- a/sys/boot/powerpc/uboot/ldscript.powerpc
+++ b/stand/powerpc/uboot/ldscript.powerpc
diff --git a/sys/boot/powerpc/uboot/start.S b/stand/powerpc/uboot/start.S
index 3e80576..3e80576 100644
--- a/sys/boot/powerpc/uboot/start.S
+++ b/stand/powerpc/uboot/start.S
diff --git a/sys/boot/powerpc/uboot/version b/stand/powerpc/uboot/version
index 21556cf..21556cf 100644
--- a/sys/boot/powerpc/uboot/version
+++ b/stand/powerpc/uboot/version
diff --git a/sys/boot/sparc64/Makefile b/stand/sparc64/Makefile
index 6a81a05..6a81a05 100644
--- a/sys/boot/sparc64/Makefile
+++ b/stand/sparc64/Makefile
diff --git a/sys/boot/sparc64/Makefile.inc b/stand/sparc64/Makefile.inc
index a12699c..a12699c 100644
--- a/sys/boot/sparc64/Makefile.inc
+++ b/stand/sparc64/Makefile.inc
diff --git a/sys/boot/sparc64/boot1/Makefile b/stand/sparc64/boot1/Makefile
index 36e3968..36e3968 100644
--- a/sys/boot/sparc64/boot1/Makefile
+++ b/stand/sparc64/boot1/Makefile
diff --git a/sys/boot/sparc64/boot1/_start.s b/stand/sparc64/boot1/_start.s
index 30f8019..30f8019 100644
--- a/sys/boot/sparc64/boot1/_start.s
+++ b/stand/sparc64/boot1/_start.s
diff --git a/sys/boot/sparc64/boot1/boot1.c b/stand/sparc64/boot1/boot1.c
index 4724ca1..4724ca1 100644
--- a/sys/boot/sparc64/boot1/boot1.c
+++ b/stand/sparc64/boot1/boot1.c
diff --git a/sys/boot/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile
index 5388761..5388761 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/stand/sparc64/loader/Makefile
diff --git a/sys/boot/sparc64/loader/help.sparc64 b/stand/sparc64/loader/help.sparc64
index e69de29..e69de29 100644
--- a/sys/boot/sparc64/loader/help.sparc64
+++ b/stand/sparc64/loader/help.sparc64
diff --git a/sys/boot/sparc64/loader/locore.S b/stand/sparc64/loader/locore.S
index a73f5bf..a73f5bf 100644
--- a/sys/boot/sparc64/loader/locore.S
+++ b/stand/sparc64/loader/locore.S
diff --git a/sys/boot/sparc64/loader/main.c b/stand/sparc64/loader/main.c
index e8cdf5f..e8cdf5f 100644
--- a/sys/boot/sparc64/loader/main.c
+++ b/stand/sparc64/loader/main.c
diff --git a/sys/boot/sparc64/loader/metadata.c b/stand/sparc64/loader/metadata.c
index a3b3eb5..a3b3eb5 100644
--- a/sys/boot/sparc64/loader/metadata.c
+++ b/stand/sparc64/loader/metadata.c
diff --git a/sys/boot/sparc64/loader/version b/stand/sparc64/loader/version
index bef4091..bef4091 100644
--- a/sys/boot/sparc64/loader/version
+++ b/stand/sparc64/loader/version
diff --git a/sys/boot/sparc64/zfsboot/Makefile b/stand/sparc64/zfsboot/Makefile
index 9e58c27..9e58c27 100644
--- a/sys/boot/sparc64/zfsboot/Makefile
+++ b/stand/sparc64/zfsboot/Makefile
diff --git a/sys/boot/sparc64/zfsloader/Makefile b/stand/sparc64/zfsloader/Makefile
index b4c554b..b4c554b 100644
--- a/sys/boot/sparc64/zfsloader/Makefile
+++ b/stand/sparc64/zfsloader/Makefile
diff --git a/sys/boot/uboot.mk b/stand/uboot.mk
index d120481..d120481 100644
--- a/sys/boot/uboot.mk
+++ b/stand/uboot.mk
diff --git a/sys/boot/uboot/Makefile b/stand/uboot/Makefile
index 8c3a80d..8c3a80d 100644
--- a/sys/boot/uboot/Makefile
+++ b/stand/uboot/Makefile
diff --git a/sys/boot/uboot/Makefile.inc b/stand/uboot/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/uboot/Makefile.inc
+++ b/stand/uboot/Makefile.inc
diff --git a/sys/boot/uboot/common/main.c b/stand/uboot/common/main.c
index c4efb1f..c4efb1f 100644
--- a/sys/boot/uboot/common/main.c
+++ b/stand/uboot/common/main.c
diff --git a/sys/boot/uboot/common/metadata.c b/stand/uboot/common/metadata.c
index 38db4bc..38db4bc 100644
--- a/sys/boot/uboot/common/metadata.c
+++ b/stand/uboot/common/metadata.c
diff --git a/sys/boot/uboot/fdt/Makefile b/stand/uboot/fdt/Makefile
index 4bc38ec..4bc38ec 100644
--- a/sys/boot/uboot/fdt/Makefile
+++ b/stand/uboot/fdt/Makefile
diff --git a/sys/boot/uboot/fdt/uboot_fdt.c b/stand/uboot/fdt/uboot_fdt.c
index aed7885..aed7885 100644
--- a/sys/boot/uboot/fdt/uboot_fdt.c
+++ b/stand/uboot/fdt/uboot_fdt.c
diff --git a/sys/boot/uboot/lib/Makefile b/stand/uboot/lib/Makefile
index d12d48c..d12d48c 100644
--- a/sys/boot/uboot/lib/Makefile
+++ b/stand/uboot/lib/Makefile
diff --git a/sys/boot/uboot/lib/api_public.h b/stand/uboot/lib/api_public.h
index f393de8..f393de8 100644
--- a/sys/boot/uboot/lib/api_public.h
+++ b/stand/uboot/lib/api_public.h
diff --git a/sys/boot/uboot/lib/console.c b/stand/uboot/lib/console.c
index f49f455c..f49f455c 100644
--- a/sys/boot/uboot/lib/console.c
+++ b/stand/uboot/lib/console.c
diff --git a/sys/boot/uboot/lib/copy.c b/stand/uboot/lib/copy.c
index 131b88d..131b88d 100644
--- a/sys/boot/uboot/lib/copy.c
+++ b/stand/uboot/lib/copy.c
diff --git a/sys/boot/uboot/lib/devicename.c b/stand/uboot/lib/devicename.c
index 9e68f9d..9e68f9d 100644
--- a/sys/boot/uboot/lib/devicename.c
+++ b/stand/uboot/lib/devicename.c
diff --git a/sys/boot/uboot/lib/disk.c b/stand/uboot/lib/disk.c
index f5e44c7..f5e44c7 100644
--- a/sys/boot/uboot/lib/disk.c
+++ b/stand/uboot/lib/disk.c
diff --git a/sys/boot/uboot/lib/elf_freebsd.c b/stand/uboot/lib/elf_freebsd.c
index a65fa26..a65fa26 100644
--- a/sys/boot/uboot/lib/elf_freebsd.c
+++ b/stand/uboot/lib/elf_freebsd.c
diff --git a/sys/boot/uboot/lib/glue.c b/stand/uboot/lib/glue.c
index 312075a..312075a 100644
--- a/sys/boot/uboot/lib/glue.c
+++ b/stand/uboot/lib/glue.c
diff --git a/sys/boot/uboot/lib/glue.h b/stand/uboot/lib/glue.h
index 4c2da66..4c2da66 100644
--- a/sys/boot/uboot/lib/glue.h
+++ b/stand/uboot/lib/glue.h
diff --git a/sys/boot/uboot/lib/libuboot.h b/stand/uboot/lib/libuboot.h
index c6cf93c..c6cf93c 100644
--- a/sys/boot/uboot/lib/libuboot.h
+++ b/stand/uboot/lib/libuboot.h
diff --git a/sys/boot/uboot/lib/module.c b/stand/uboot/lib/module.c
index 0951ed6..0951ed6 100644
--- a/sys/boot/uboot/lib/module.c
+++ b/stand/uboot/lib/module.c
diff --git a/sys/boot/uboot/lib/net.c b/stand/uboot/lib/net.c
index a0d1cb4..a0d1cb4 100644
--- a/sys/boot/uboot/lib/net.c
+++ b/stand/uboot/lib/net.c
diff --git a/sys/boot/uboot/lib/reboot.c b/stand/uboot/lib/reboot.c
index 9f4d277..9f4d277 100644
--- a/sys/boot/uboot/lib/reboot.c
+++ b/stand/uboot/lib/reboot.c
diff --git a/sys/boot/uboot/lib/time.c b/stand/uboot/lib/time.c
index a3c73f4..a3c73f4 100644
--- a/sys/boot/uboot/lib/time.c
+++ b/stand/uboot/lib/time.c
diff --git a/sys/boot/usb/Makefile b/stand/usb/Makefile
index 1b94b3d..1b94b3d 100644
--- a/sys/boot/usb/Makefile
+++ b/stand/usb/Makefile
diff --git a/sys/boot/usb/Makefile.test b/stand/usb/Makefile.test
index 7c6a66d1..7c6a66d1 100644
--- a/sys/boot/usb/Makefile.test
+++ b/stand/usb/Makefile.test
diff --git a/sys/boot/usb/bsd_usbloader_test.c b/stand/usb/bsd_usbloader_test.c
index 35140b8..35140b8 100644
--- a/sys/boot/usb/bsd_usbloader_test.c
+++ b/stand/usb/bsd_usbloader_test.c
diff --git a/sys/boot/usb/storage/umass_common.c b/stand/usb/storage/umass_common.c
index 5ddd159..5ddd159 100644
--- a/sys/boot/usb/storage/umass_common.c
+++ b/stand/usb/storage/umass_common.c
diff --git a/sys/boot/usb/storage/umass_common.h b/stand/usb/storage/umass_common.h
index a8ffd49..a8ffd49 100644
--- a/sys/boot/usb/storage/umass_common.h
+++ b/stand/usb/storage/umass_common.h
diff --git a/sys/boot/usb/storage/umass_loader.c b/stand/usb/storage/umass_loader.c
index fbb890b..fbb890b 100644
--- a/sys/boot/usb/storage/umass_loader.c
+++ b/stand/usb/storage/umass_loader.c
diff --git a/sys/boot/usb/tools/Makefile b/stand/usb/tools/Makefile
index 64cf28c..64cf28c 100644
--- a/sys/boot/usb/tools/Makefile
+++ b/stand/usb/tools/Makefile
diff --git a/sys/boot/usb/tools/sysinit.c b/stand/usb/tools/sysinit.c
index b968fe0..b968fe0 100644
--- a/sys/boot/usb/tools/sysinit.c
+++ b/stand/usb/tools/sysinit.c
diff --git a/sys/boot/usb/usb_busdma_loader.c b/stand/usb/usb_busdma_loader.c
index 90dc169..90dc169 100644
--- a/sys/boot/usb/usb_busdma_loader.c
+++ b/stand/usb/usb_busdma_loader.c
diff --git a/sys/boot/usb/usbcore.mk b/stand/usb/usbcore.mk
index 153a1d4..153a1d4 100644
--- a/sys/boot/usb/usbcore.mk
+++ b/stand/usb/usbcore.mk
diff --git a/sys/boot/userboot/Makefile b/stand/userboot/Makefile
index 0a53a21..0a53a21 100644
--- a/sys/boot/userboot/Makefile
+++ b/stand/userboot/Makefile
diff --git a/sys/boot/userboot/Makefile.inc b/stand/userboot/Makefile.inc
index 265f86d..265f86d 100644
--- a/sys/boot/userboot/Makefile.inc
+++ b/stand/userboot/Makefile.inc
diff --git a/sys/boot/userboot/test/Makefile b/stand/userboot/test/Makefile
index 1bc6679..1bc6679 100644
--- a/sys/boot/userboot/test/Makefile
+++ b/stand/userboot/test/Makefile
diff --git a/sys/boot/userboot/test/Makefile.depend b/stand/userboot/test/Makefile.depend
index 3646e2e..3646e2e 100644
--- a/sys/boot/userboot/test/Makefile.depend
+++ b/stand/userboot/test/Makefile.depend
diff --git a/sys/boot/userboot/test/test.c b/stand/userboot/test/test.c
index 6c885c3..6c885c3 100644
--- a/sys/boot/userboot/test/test.c
+++ b/stand/userboot/test/test.c
diff --git a/sys/boot/userboot/userboot.h b/stand/userboot/userboot.h
index 2e4a4b4..2e4a4b4 100644
--- a/sys/boot/userboot/userboot.h
+++ b/stand/userboot/userboot.h
diff --git a/sys/boot/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile
index cbada82..cbada82 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/stand/userboot/userboot/Makefile
diff --git a/sys/boot/userboot/userboot/Makefile.depend b/stand/userboot/userboot/Makefile.depend
index 871417f..871417f 100644
--- a/sys/boot/userboot/userboot/Makefile.depend
+++ b/stand/userboot/userboot/Makefile.depend
diff --git a/sys/boot/userboot/userboot/autoload.c b/stand/userboot/userboot/autoload.c
index a86afcf..a86afcf 100644
--- a/sys/boot/userboot/userboot/autoload.c
+++ b/stand/userboot/userboot/autoload.c
diff --git a/sys/boot/userboot/userboot/biossmap.c b/stand/userboot/userboot/biossmap.c
index 9e556be..9e556be 100644
--- a/sys/boot/userboot/userboot/biossmap.c
+++ b/stand/userboot/userboot/biossmap.c
diff --git a/sys/boot/userboot/userboot/bootinfo.c b/stand/userboot/userboot/bootinfo.c
index 289ca07..289ca07 100644
--- a/sys/boot/userboot/userboot/bootinfo.c
+++ b/stand/userboot/userboot/bootinfo.c
diff --git a/sys/boot/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c
index 6498461..6498461 100644
--- a/sys/boot/userboot/userboot/bootinfo32.c
+++ b/stand/userboot/userboot/bootinfo32.c
diff --git a/sys/boot/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c
index 10ff133..10ff133 100644
--- a/sys/boot/userboot/userboot/bootinfo64.c
+++ b/stand/userboot/userboot/bootinfo64.c
diff --git a/sys/boot/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c
index b8daa73..b8daa73 100644
--- a/sys/boot/userboot/userboot/conf.c
+++ b/stand/userboot/userboot/conf.c
diff --git a/sys/boot/userboot/userboot/copy.c b/stand/userboot/userboot/copy.c
index f8763e9..f8763e9 100644
--- a/sys/boot/userboot/userboot/copy.c
+++ b/stand/userboot/userboot/copy.c
diff --git a/sys/boot/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c
index efa5634..efa5634 100644
--- a/sys/boot/userboot/userboot/devicename.c
+++ b/stand/userboot/userboot/devicename.c
diff --git a/sys/boot/userboot/userboot/elf32_freebsd.c b/stand/userboot/userboot/elf32_freebsd.c
index d8ccc33..d8ccc33 100644
--- a/sys/boot/userboot/userboot/elf32_freebsd.c
+++ b/stand/userboot/userboot/elf32_freebsd.c
diff --git a/sys/boot/userboot/userboot/elf64_freebsd.c b/stand/userboot/userboot/elf64_freebsd.c
index 19d369d..19d369d 100644
--- a/sys/boot/userboot/userboot/elf64_freebsd.c
+++ b/stand/userboot/userboot/elf64_freebsd.c
diff --git a/sys/boot/userboot/userboot/host.c b/stand/userboot/userboot/host.c
index 94f8a3d..94f8a3d 100644
--- a/sys/boot/userboot/userboot/host.c
+++ b/stand/userboot/userboot/host.c
diff --git a/sys/boot/userboot/userboot/libuserboot.h b/stand/userboot/userboot/libuserboot.h
index e2048d5..e2048d5 100644
--- a/sys/boot/userboot/userboot/libuserboot.h
+++ b/stand/userboot/userboot/libuserboot.h
diff --git a/sys/boot/userboot/userboot/main.c b/stand/userboot/userboot/main.c
index 7f59eb7..7f59eb7 100644
--- a/sys/boot/userboot/userboot/main.c
+++ b/stand/userboot/userboot/main.c
diff --git a/sys/boot/userboot/userboot/userboot_cons.c b/stand/userboot/userboot/userboot_cons.c
index 6f73ad5..6f73ad5 100644
--- a/sys/boot/userboot/userboot/userboot_cons.c
+++ b/stand/userboot/userboot/userboot_cons.c
diff --git a/sys/boot/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c
index fc21b5f..fc21b5f 100644
--- a/sys/boot/userboot/userboot/userboot_disk.c
+++ b/stand/userboot/userboot/userboot_disk.c
diff --git a/sys/boot/userboot/userboot/version b/stand/userboot/userboot/version
index ce6e270..ce6e270 100644
--- a/sys/boot/userboot/userboot/version
+++ b/stand/userboot/userboot/version
diff --git a/sys/boot/zfs/Makefile b/stand/zfs/Makefile
index e86c84b..e86c84b 100644
--- a/sys/boot/zfs/Makefile
+++ b/stand/zfs/Makefile
diff --git a/sys/boot/zfs/Makefile.depend b/stand/zfs/Makefile.depend
index 18be76b..18be76b 100644
--- a/sys/boot/zfs/Makefile.depend
+++ b/stand/zfs/Makefile.depend
diff --git a/sys/boot/zfs/devicename_stubs.c b/stand/zfs/devicename_stubs.c
index 41bf907..41bf907 100644
--- a/sys/boot/zfs/devicename_stubs.c
+++ b/stand/zfs/devicename_stubs.c
diff --git a/sys/boot/zfs/libzfs.h b/stand/zfs/libzfs.h
index d1b46746..d1b46746 100644
--- a/sys/boot/zfs/libzfs.h
+++ b/stand/zfs/libzfs.h
diff --git a/sys/boot/zfs/zfs.c b/stand/zfs/zfs.c
index 0334bdd..0334bdd 100644
--- a/sys/boot/zfs/zfs.c
+++ b/stand/zfs/zfs.c
diff --git a/sys/boot/zfs/zfsimpl.c b/stand/zfs/zfsimpl.c
index 6e0d9b6..6e0d9b6 100644
--- a/sys/boot/zfs/zfsimpl.c
+++ b/stand/zfs/zfsimpl.c
diff --git a/sys/boot/zfs32/Makefile b/stand/zfs32/Makefile
index 32d0074..32d0074 100644
--- a/sys/boot/zfs32/Makefile
+++ b/stand/zfs32/Makefile
diff --git a/sys/Makefile b/sys/Makefile
index ff18729..45a61d8 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -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 netnatm netpfil \
 		netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
@@ -62,11 +62,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
 
 .if defined(MODULES_WITH_WORLD)
diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index e56a33a..91770e3 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -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"
diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh
index b27c363..852f907 100755
--- a/tools/boot/universe.sh
+++ b/tools/boot/universe.sh
@@ -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 \
diff --git a/tools/tools/bootparttest/Makefile b/tools/tools/bootparttest/Makefile
index c7de091..5c23241 100644
--- a/tools/tools/bootparttest/Makefile
+++ b/tools/tools/bootparttest/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH:		${.CURDIR}/../../../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${.CURDIR}/../../../sys/boot/common \
+CFLAGS=		-I${SRCTOP}/stand/common \
 		-DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT -DPART_DEBUG \
 		-DDISK_DEBUG
 
diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile
index 1f6084e..acb510d 100644
--- a/tools/tools/zfsboottest/Makefile
+++ b/tools/tools/zfsboottest/Makefile
@@ -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 \
diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile
index f0241b8..48bed64 100644
--- a/usr.sbin/bhyveload/Makefile
+++ b/usr.sbin/bhyveload/Makefile
@@ -9,6 +9,6 @@ LIBADD=	vmmapi
 
 WARNS?=	3
 
-CFLAGS+=-I${SRCTOP}/sys/boot/userboot
+CFLAGS+=-I${SRCTOP}/stand/userboot
 
 .include <bsd.prog.mk>