Move sys/boot to stand. Fix all references to new location

Sponsored by: Netflix
jakesfreeland · Nov 14, 2017 · ca987d4 · ca987d4
1 parent 6eac711
commit ca987d4
Show file tree

Hide file tree

Showing 706 changed files with 135 additions and 137 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -86,7 +86,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
@@ -251,6 +251,9 @@ SUBDIR+=secure
 .if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
+.if ${MK_BOOT} != "no"
+SUBDIR+=stand
+.endif
 SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
@@ -2082,7 +2085,7 @@ _clang_libs=	lib/clang
 _gcc=		gnu/usr.bin/cc
 .endif
 .if ${MK_USB} != "no"
-_usb_tools=	sys/boot/usb/tools
+_usb_tools=	stand/usb/tools
 .endif
 
 cross-tools: .MAKE .PHONY

diff --git 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/arm64/PINE64.conf b/release/arm64/PINE64.conf
@@ -31,7 +31,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT

diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
@@ -45,7 +45,7 @@ arm_install_uboot() {
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/EFI/BOOT

diff --git 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
@@ -16,7 +16,7 @@ write_partition_layout() {
 
 	BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 	    WITH_UNIFIED_OBJDIR=yes \
-	    make -C ${WORLDDIR}/sys/boot -V .OBJDIR)"
+	    make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 
 	case "${TARGET}:${TARGET_ARCH}" in

diff --git 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
@@ -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
@@ -374,7 +374,7 @@ By default the
 .Xr pxeboot 8
 loader retrieves the kernel via NFS.
 Defining this and recompiling
-.Pa /usr/src/sys/boot
+.Pa /usr/src/stand
 will cause it to retrieve the kernel via TFTP.
 This allows
 .Xr pxeboot 8
@@ -385,7 +385,7 @@ rather than load the server's kernel.
 .It Va LOADER_FIREWIRE_SUPPORT
 .Pq Vt bool
 Defining this and recompiling
-.Pa /usr/src/sys/boot/i386
+.Pa /usr/src/stand/i386
 will add
 .Xr dcons 4
 console driver to

diff --git 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 → stand/Makefile b/sys/boot/Makefile → stand/Makefile
diff --git a/sys/boot/Makefile.amd64 → stand/Makefile.amd64 b/sys/boot/Makefile.amd64 → stand/Makefile.amd64
diff --git a/sys/boot/Makefile.arm → stand/Makefile.arm b/sys/boot/Makefile.arm → stand/Makefile.arm
diff --git a/sys/boot/Makefile.arm64 → stand/Makefile.arm64 b/sys/boot/Makefile.arm64 → stand/Makefile.arm64
diff --git a/sys/boot/Makefile.i386 → stand/Makefile.i386 b/sys/boot/Makefile.i386 → stand/Makefile.i386
diff --git a/sys/boot/Makefile.inc → stand/Makefile.inc b/sys/boot/Makefile.inc → stand/Makefile.inc
diff --git a/sys/boot/Makefile.mips → stand/Makefile.mips b/sys/boot/Makefile.mips → stand/Makefile.mips
diff --git a/sys/boot/Makefile.powerpc → stand/Makefile.powerpc b/sys/boot/Makefile.powerpc → stand/Makefile.powerpc
diff --git a/sys/boot/Makefile.sparc64 → stand/Makefile.sparc64 b/sys/boot/Makefile.sparc64 → stand/Makefile.sparc64
diff --git a/sys/boot/arm/Makefile → stand/arm/Makefile b/sys/boot/arm/Makefile → stand/arm/Makefile
diff --git a/sys/boot/arm/Makefile.inc → stand/arm/Makefile.inc b/sys/boot/arm/Makefile.inc → stand/arm/Makefile.inc
diff --git a/sys/boot/arm/loader/loader.conf → stand/arm/loader/loader.conf b/sys/boot/arm/loader/loader.conf → stand/arm/loader/loader.conf
diff --git a/sys/boot/arm/uboot/Makefile → stand/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile → stand/arm/uboot/Makefile
diff --git a/sys/boot/arm/uboot/conf.c → stand/arm/uboot/conf.c b/sys/boot/arm/uboot/conf.c → stand/arm/uboot/conf.c
diff --git a/sys/boot/arm/uboot/help.uboot → stand/arm/uboot/help.uboot b/sys/boot/arm/uboot/help.uboot → stand/arm/uboot/help.uboot
diff --git a/sys/boot/arm/uboot/ldscript.arm → stand/arm/uboot/ldscript.arm b/sys/boot/arm/uboot/ldscript.arm → stand/arm/uboot/ldscript.arm
diff --git a/sys/boot/arm/uboot/start.S → stand/arm/uboot/start.S b/sys/boot/arm/uboot/start.S → stand/arm/uboot/start.S
diff --git a/sys/boot/arm/uboot/version → stand/arm/uboot/version b/sys/boot/arm/uboot/version → stand/arm/uboot/version
diff --git a/sys/boot/arm64/Makefile → stand/arm64/Makefile b/sys/boot/arm64/Makefile → stand/arm64/Makefile
diff --git a/sys/boot/arm64/libarm64/cache.c → stand/arm64/libarm64/cache.c b/sys/boot/arm64/libarm64/cache.c → stand/arm64/libarm64/cache.c
diff --git a/sys/boot/arm64/libarm64/cache.h → stand/arm64/libarm64/cache.h b/sys/boot/arm64/libarm64/cache.h → stand/arm64/libarm64/cache.h
diff --git a/sys/boot/common/Makefile.depend → stand/common/Makefile.depend b/sys/boot/common/Makefile.depend → stand/common/Makefile.depend
diff --git a/sys/boot/common/bcache.c → stand/common/bcache.c b/sys/boot/common/bcache.c → stand/common/bcache.c
diff --git a/sys/boot/common/boot.c → stand/common/boot.c b/sys/boot/common/boot.c → stand/common/boot.c
diff --git a/sys/boot/common/bootstrap.h → stand/common/bootstrap.h b/sys/boot/common/bootstrap.h → stand/common/bootstrap.h
diff --git a/sys/boot/common/commands.c → stand/common/commands.c b/sys/boot/common/commands.c → stand/common/commands.c
diff --git a/sys/boot/common/console.c → stand/common/console.c b/sys/boot/common/console.c → stand/common/console.c
diff --git a/sys/boot/common/dev_net.c → stand/common/dev_net.c b/sys/boot/common/dev_net.c → stand/common/dev_net.c
diff --git a/sys/boot/common/dev_net.h → stand/common/dev_net.h b/sys/boot/common/dev_net.h → stand/common/dev_net.h
diff --git a/sys/boot/common/devopen.c → stand/common/devopen.c b/sys/boot/common/devopen.c → stand/common/devopen.c
diff --git a/sys/boot/common/disk.c → stand/common/disk.c b/sys/boot/common/disk.c → stand/common/disk.c
diff --git a/sys/boot/common/disk.h → stand/common/disk.h b/sys/boot/common/disk.h → stand/common/disk.h
diff --git a/sys/boot/common/help.common → stand/common/help.common b/sys/boot/common/help.common → stand/common/help.common
diff --git a/sys/boot/common/install.c → stand/common/install.c b/sys/boot/common/install.c → stand/common/install.c
diff --git a/sys/boot/common/interp.c → stand/common/interp.c b/sys/boot/common/interp.c → stand/common/interp.c
diff --git a/sys/boot/common/interp_backslash.c → stand/common/interp_backslash.c b/sys/boot/common/interp_backslash.c → stand/common/interp_backslash.c
diff --git a/sys/boot/common/interp_forth.c → stand/common/interp_forth.c b/sys/boot/common/interp_forth.c → stand/common/interp_forth.c
diff --git a/sys/boot/common/interp_parse.c → stand/common/interp_parse.c b/sys/boot/common/interp_parse.c → stand/common/interp_parse.c
diff --git a/sys/boot/common/isapnp.c → stand/common/isapnp.c b/sys/boot/common/isapnp.c → stand/common/isapnp.c
diff --git a/sys/boot/common/isapnp.h → stand/common/isapnp.h b/sys/boot/common/isapnp.h → stand/common/isapnp.h
diff --git a/sys/boot/common/load_elf.c → stand/common/load_elf.c b/sys/boot/common/load_elf.c → stand/common/load_elf.c
diff --git a/sys/boot/common/load_elf32.c → stand/common/load_elf32.c b/sys/boot/common/load_elf32.c → stand/common/load_elf32.c
diff --git a/sys/boot/common/load_elf32_obj.c → stand/common/load_elf32_obj.c b/sys/boot/common/load_elf32_obj.c → stand/common/load_elf32_obj.c
diff --git a/sys/boot/common/load_elf64.c → stand/common/load_elf64.c b/sys/boot/common/load_elf64.c → stand/common/load_elf64.c
diff --git a/sys/boot/common/load_elf64_obj.c → stand/common/load_elf64_obj.c b/sys/boot/common/load_elf64_obj.c → stand/common/load_elf64_obj.c
diff --git a/sys/boot/common/load_elf_obj.c → stand/common/load_elf_obj.c b/sys/boot/common/load_elf_obj.c → stand/common/load_elf_obj.c
diff --git a/sys/boot/common/ls.c → stand/common/ls.c b/sys/boot/common/ls.c → stand/common/ls.c
diff --git a/sys/boot/common/md.c → stand/common/md.c b/sys/boot/common/md.c → stand/common/md.c
diff --git a/sys/boot/common/merge_help.awk → stand/common/merge_help.awk b/sys/boot/common/merge_help.awk → stand/common/merge_help.awk
diff --git a/sys/boot/common/misc.c → stand/common/misc.c b/sys/boot/common/misc.c → stand/common/misc.c
diff --git a/sys/boot/common/module.c → stand/common/module.c b/sys/boot/common/module.c → stand/common/module.c
diff --git a/sys/boot/common/newvers.sh → stand/common/newvers.sh b/sys/boot/common/newvers.sh → stand/common/newvers.sh
diff --git a/sys/boot/common/part.c → stand/common/part.c b/sys/boot/common/part.c → stand/common/part.c
diff --git a/sys/boot/common/part.h → stand/common/part.h b/sys/boot/common/part.h → stand/common/part.h
diff --git a/sys/boot/common/paths.h → stand/common/paths.h b/sys/boot/common/paths.h → stand/common/paths.h
diff --git a/sys/boot/common/pnp.c → stand/common/pnp.c b/sys/boot/common/pnp.c → stand/common/pnp.c
diff --git a/sys/boot/common/rbx.h → stand/common/rbx.h b/sys/boot/common/rbx.h → stand/common/rbx.h
diff --git a/sys/boot/common/reloc_elf.c → stand/common/reloc_elf.c b/sys/boot/common/reloc_elf.c → stand/common/reloc_elf.c
diff --git a/sys/boot/common/reloc_elf32.c → stand/common/reloc_elf32.c b/sys/boot/common/reloc_elf32.c → stand/common/reloc_elf32.c
diff --git a/sys/boot/common/reloc_elf64.c → stand/common/reloc_elf64.c b/sys/boot/common/reloc_elf64.c → stand/common/reloc_elf64.c
diff --git a/sys/boot/common/self_reloc.c → stand/common/self_reloc.c b/sys/boot/common/self_reloc.c → stand/common/self_reloc.c
diff --git a/sys/boot/defs.mk → stand/defs.mk b/sys/boot/defs.mk → 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 → stand/efi/Makefile b/sys/boot/efi/Makefile → stand/efi/Makefile
diff --git a/sys/boot/efi/Makefile.inc → stand/efi/Makefile.inc b/sys/boot/efi/Makefile.inc → stand/efi/Makefile.inc
diff --git a/sys/boot/efi/boot1/Makefile → stand/efi/boot1/Makefile b/sys/boot/efi/boot1/Makefile → stand/efi/boot1/Makefile
diff --git a/sys/boot/efi/boot1/Makefile.depend → stand/efi/boot1/Makefile.depend b/sys/boot/efi/boot1/Makefile.depend → stand/efi/boot1/Makefile.depend
@@ -5,9 +5,9 @@ DIRDEPS = \
 	include \
 	include/xlocale \
 	lib/libmd \
-	sys/boot/efi/libefi \
-	sys/boot/libsa \
-	sys/boot/zfs \
+	stand/efi/libefi \
+	stand/libsa \
+	stand/zfs \
 
 
 .include <dirdeps.mk>

diff --git a/sys/boot/efi/boot1/Makefile.fat → stand/efi/boot1/Makefile.fat b/sys/boot/efi/boot1/Makefile.fat → stand/efi/boot1/Makefile.fat
diff --git a/sys/boot/efi/boot1/boot1.c → stand/efi/boot1/boot1.c b/sys/boot/efi/boot1/boot1.c → stand/efi/boot1/boot1.c
diff --git a/sys/boot/efi/boot1/boot_module.h → stand/efi/boot1/boot_module.h b/sys/boot/efi/boot1/boot_module.h → stand/efi/boot1/boot_module.h
diff --git a/sys/boot/efi/boot1/fat-amd64.tmpl.xz → stand/efi/boot1/fat-amd64.tmpl.xz b/sys/boot/efi/boot1/fat-amd64.tmpl.xz → stand/efi/boot1/fat-amd64.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-arm.tmpl.xz → stand/efi/boot1/fat-arm.tmpl.xz b/sys/boot/efi/boot1/fat-arm.tmpl.xz → stand/efi/boot1/fat-arm.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-arm64.tmpl.xz → stand/efi/boot1/fat-arm64.tmpl.xz b/sys/boot/efi/boot1/fat-arm64.tmpl.xz → stand/efi/boot1/fat-arm64.tmpl.xz
diff --git a/sys/boot/efi/boot1/fat-i386.tmpl.xz → stand/efi/boot1/fat-i386.tmpl.xz b/sys/boot/efi/boot1/fat-i386.tmpl.xz → stand/efi/boot1/fat-i386.tmpl.xz
diff --git a/sys/boot/efi/boot1/generate-fat.sh → stand/efi/boot1/generate-fat.sh b/sys/boot/efi/boot1/generate-fat.sh → stand/efi/boot1/generate-fat.sh
diff --git a/sys/boot/efi/boot1/ufs_module.c → stand/efi/boot1/ufs_module.c b/sys/boot/efi/boot1/ufs_module.c → stand/efi/boot1/ufs_module.c
diff --git a/sys/boot/efi/boot1/zfs_module.c → stand/efi/boot1/zfs_module.c b/sys/boot/efi/boot1/zfs_module.c → stand/efi/boot1/zfs_module.c
diff --git a/sys/boot/efi/fdt/Makefile → stand/efi/fdt/Makefile b/sys/boot/efi/fdt/Makefile → stand/efi/fdt/Makefile
diff --git a/sys/boot/efi/fdt/Makefile.depend → stand/efi/fdt/Makefile.depend b/sys/boot/efi/fdt/Makefile.depend → stand/efi/fdt/Makefile.depend
diff --git a/sys/boot/efi/fdt/efi_fdt.c → stand/efi/fdt/efi_fdt.c b/sys/boot/efi/fdt/efi_fdt.c → stand/efi/fdt/efi_fdt.c
diff --git a/sys/boot/efi/include/README → stand/efi/include/README b/sys/boot/efi/include/README → stand/efi/include/README
diff --git a/sys/boot/efi/include/amd64/efibind.h → stand/efi/include/amd64/efibind.h b/sys/boot/efi/include/amd64/efibind.h → stand/efi/include/amd64/efibind.h
diff --git a/sys/boot/efi/include/amd64/pe.h → stand/efi/include/amd64/pe.h b/sys/boot/efi/include/amd64/pe.h → stand/efi/include/amd64/pe.h
diff --git a/sys/boot/efi/include/arm/efibind.h → stand/efi/include/arm/efibind.h b/sys/boot/efi/include/arm/efibind.h → stand/efi/include/arm/efibind.h
diff --git a/sys/boot/efi/include/arm64/efibind.h → stand/efi/include/arm64/efibind.h b/sys/boot/efi/include/arm64/efibind.h → stand/efi/include/arm64/efibind.h
diff --git a/sys/boot/efi/include/efi.h → stand/efi/include/efi.h b/sys/boot/efi/include/efi.h → stand/efi/include/efi.h
diff --git a/sys/boot/efi/include/efi_driver_utils.h → stand/efi/include/efi_driver_utils.h b/sys/boot/efi/include/efi_driver_utils.h → stand/efi/include/efi_driver_utils.h
diff --git a/sys/boot/efi/include/efi_drivers.h → stand/efi/include/efi_drivers.h b/sys/boot/efi/include/efi_drivers.h → stand/efi/include/efi_drivers.h
diff --git a/sys/boot/efi/include/efi_nii.h → stand/efi/include/efi_nii.h b/sys/boot/efi/include/efi_nii.h → stand/efi/include/efi_nii.h
diff --git a/sys/boot/efi/include/efiapi.h → stand/efi/include/efiapi.h b/sys/boot/efi/include/efiapi.h → stand/efi/include/efiapi.h
diff --git a/sys/boot/efi/include/efichar.h → stand/efi/include/efichar.h b/sys/boot/efi/include/efichar.h → stand/efi/include/efichar.h
diff --git a/sys/boot/efi/include/eficon.h → stand/efi/include/eficon.h b/sys/boot/efi/include/eficon.h → stand/efi/include/eficon.h
diff --git a/sys/boot/efi/include/eficonsctl.h → stand/efi/include/eficonsctl.h b/sys/boot/efi/include/eficonsctl.h → stand/efi/include/eficonsctl.h
diff --git a/sys/boot/efi/include/efidebug.h → stand/efi/include/efidebug.h b/sys/boot/efi/include/efidebug.h → stand/efi/include/efidebug.h
diff --git a/sys/boot/efi/include/efidef.h → stand/efi/include/efidef.h b/sys/boot/efi/include/efidef.h → stand/efi/include/efidef.h
diff --git a/sys/boot/efi/include/efidevp.h → stand/efi/include/efidevp.h b/sys/boot/efi/include/efidevp.h → stand/efi/include/efidevp.h
diff --git a/sys/boot/efi/include/efierr.h → stand/efi/include/efierr.h b/sys/boot/efi/include/efierr.h → stand/efi/include/efierr.h
diff --git a/sys/boot/efi/include/efifpswa.h → stand/efi/include/efifpswa.h b/sys/boot/efi/include/efifpswa.h → stand/efi/include/efifpswa.h
diff --git a/sys/boot/efi/include/efifs.h → stand/efi/include/efifs.h b/sys/boot/efi/include/efifs.h → stand/efi/include/efifs.h
diff --git a/sys/boot/efi/include/efigop.h → stand/efi/include/efigop.h b/sys/boot/efi/include/efigop.h → stand/efi/include/efigop.h
diff --git a/sys/boot/efi/include/efilib.h → stand/efi/include/efilib.h b/sys/boot/efi/include/efilib.h → stand/efi/include/efilib.h
diff --git a/sys/boot/efi/include/efinet.h → stand/efi/include/efinet.h b/sys/boot/efi/include/efinet.h → stand/efi/include/efinet.h
diff --git a/sys/boot/efi/include/efipart.h → stand/efi/include/efipart.h b/sys/boot/efi/include/efipart.h → stand/efi/include/efipart.h
diff --git a/sys/boot/efi/include/efipciio.h → stand/efi/include/efipciio.h b/sys/boot/efi/include/efipciio.h → stand/efi/include/efipciio.h
diff --git a/sys/boot/efi/include/efiprot.h → stand/efi/include/efiprot.h b/sys/boot/efi/include/efiprot.h → stand/efi/include/efiprot.h
diff --git a/sys/boot/efi/include/efipxebc.h → stand/efi/include/efipxebc.h b/sys/boot/efi/include/efipxebc.h → stand/efi/include/efipxebc.h
diff --git a/sys/boot/efi/include/efiser.h → stand/efi/include/efiser.h b/sys/boot/efi/include/efiser.h → stand/efi/include/efiser.h
diff --git a/sys/boot/efi/include/efistdarg.h → stand/efi/include/efistdarg.h b/sys/boot/efi/include/efistdarg.h → stand/efi/include/efistdarg.h
diff --git a/sys/boot/efi/include/efiuga.h → stand/efi/include/efiuga.h b/sys/boot/efi/include/efiuga.h → stand/efi/include/efiuga.h
diff --git a/sys/boot/efi/include/efizfs.h → stand/efi/include/efizfs.h b/sys/boot/efi/include/efizfs.h → stand/efi/include/efizfs.h
diff --git a/sys/boot/efi/include/i386/efibind.h → stand/efi/include/i386/efibind.h b/sys/boot/efi/include/i386/efibind.h → stand/efi/include/i386/efibind.h
diff --git a/sys/boot/efi/include/i386/pe.h → stand/efi/include/i386/pe.h b/sys/boot/efi/include/i386/pe.h → stand/efi/include/i386/pe.h
diff --git a/sys/boot/efi/libefi/Makefile → stand/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile → stand/efi/libefi/Makefile
diff --git a/sys/boot/efi/libefi/Makefile.depend → stand/efi/libefi/Makefile.depend b/sys/boot/efi/libefi/Makefile.depend → stand/efi/libefi/Makefile.depend
diff --git a/sys/boot/efi/libefi/delay.c → stand/efi/libefi/delay.c b/sys/boot/efi/libefi/delay.c → stand/efi/libefi/delay.c
diff --git a/sys/boot/efi/libefi/devicename.c → stand/efi/libefi/devicename.c b/sys/boot/efi/libefi/devicename.c → stand/efi/libefi/devicename.c
diff --git a/sys/boot/efi/libefi/devpath.c → stand/efi/libefi/devpath.c b/sys/boot/efi/libefi/devpath.c → stand/efi/libefi/devpath.c
diff --git a/sys/boot/efi/libefi/efi_console.c → stand/efi/libefi/efi_console.c b/sys/boot/efi/libefi/efi_console.c → stand/efi/libefi/efi_console.c
diff --git a/sys/boot/efi/libefi/efi_driver_utils.c → stand/efi/libefi/efi_driver_utils.c b/sys/boot/efi/libefi/efi_driver_utils.c → stand/efi/libefi/efi_driver_utils.c
diff --git a/sys/boot/efi/libefi/efichar.c → stand/efi/libefi/efichar.c b/sys/boot/efi/libefi/efichar.c → stand/efi/libefi/efichar.c
diff --git a/sys/boot/efi/libefi/efinet.c → stand/efi/libefi/efinet.c b/sys/boot/efi/libefi/efinet.c → stand/efi/libefi/efinet.c
diff --git a/sys/boot/efi/libefi/efipart.c → stand/efi/libefi/efipart.c b/sys/boot/efi/libefi/efipart.c → stand/efi/libefi/efipart.c
diff --git a/sys/boot/efi/libefi/efizfs.c → stand/efi/libefi/efizfs.c b/sys/boot/efi/libefi/efizfs.c → stand/efi/libefi/efizfs.c
diff --git a/sys/boot/efi/libefi/env.c → stand/efi/libefi/env.c b/sys/boot/efi/libefi/env.c → stand/efi/libefi/env.c
diff --git a/sys/boot/efi/libefi/errno.c → stand/efi/libefi/errno.c b/sys/boot/efi/libefi/errno.c → stand/efi/libefi/errno.c
diff --git a/sys/boot/efi/libefi/handles.c → stand/efi/libefi/handles.c b/sys/boot/efi/libefi/handles.c → stand/efi/libefi/handles.c
diff --git a/sys/boot/efi/libefi/libefi.c → stand/efi/libefi/libefi.c b/sys/boot/efi/libefi/libefi.c → stand/efi/libefi/libefi.c
diff --git a/sys/boot/efi/libefi/time.c → stand/efi/libefi/time.c b/sys/boot/efi/libefi/time.c → stand/efi/libefi/time.c
diff --git a/sys/boot/efi/libefi/time_event.c → stand/efi/libefi/time_event.c b/sys/boot/efi/libefi/time_event.c → stand/efi/libefi/time_event.c
diff --git a/sys/boot/efi/libefi/wchar.c → stand/efi/libefi/wchar.c b/sys/boot/efi/libefi/wchar.c → stand/efi/libefi/wchar.c
diff --git a/sys/boot/efi/loader/Makefile → stand/efi/loader/Makefile b/sys/boot/efi/loader/Makefile → stand/efi/loader/Makefile
diff --git a/sys/boot/efi/loader/Makefile.depend → stand/efi/loader/Makefile.depend b/sys/boot/efi/loader/Makefile.depend → stand/efi/loader/Makefile.depend
@@ -4,10 +4,10 @@
 DIRDEPS = \
 	include \
 	include/xlocale \
-	sys/boot/efi/libefi \
-	sys/boot/ficl \
-	sys/boot/libsa \
-	sys/boot/zfs \
+	stand/efi/libefi \
+	stand/ficl \
+	stand/libsa \
+	stand/zfs \
 
 
 .include <dirdeps.mk>

diff --git a/sys/boot/efi/loader/arch/amd64/Makefile.inc → stand/efi/loader/arch/amd64/Makefile.inc b/sys/boot/efi/loader/arch/amd64/Makefile.inc → stand/efi/loader/arch/amd64/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/amd64/amd64_tramp.S → stand/efi/loader/arch/amd64/amd64_tramp.S b/sys/boot/efi/loader/arch/amd64/amd64_tramp.S → stand/efi/loader/arch/amd64/amd64_tramp.S
diff --git a/...oot/efi/loader/arch/amd64/elf64_freebsd.c → stand/efi/loader/arch/amd64/elf64_freebsd.c b/...oot/efi/loader/arch/amd64/elf64_freebsd.c → stand/efi/loader/arch/amd64/elf64_freebsd.c
diff --git a/sys/boot/efi/loader/arch/amd64/exc.S → stand/efi/loader/arch/amd64/exc.S b/sys/boot/efi/loader/arch/amd64/exc.S → stand/efi/loader/arch/amd64/exc.S
diff --git a/...boot/efi/loader/arch/amd64/ldscript.amd64 → stand/efi/loader/arch/amd64/ldscript.amd64 b/...boot/efi/loader/arch/amd64/ldscript.amd64 → stand/efi/loader/arch/amd64/ldscript.amd64
diff --git a/sys/boot/efi/loader/arch/amd64/start.S → stand/efi/loader/arch/amd64/start.S b/sys/boot/efi/loader/arch/amd64/start.S → stand/efi/loader/arch/amd64/start.S
diff --git a/sys/boot/efi/loader/arch/amd64/trap.c → stand/efi/loader/arch/amd64/trap.c b/sys/boot/efi/loader/arch/amd64/trap.c → stand/efi/loader/arch/amd64/trap.c
diff --git a/sys/boot/efi/loader/arch/arm/Makefile.inc → stand/efi/loader/arch/arm/Makefile.inc b/sys/boot/efi/loader/arch/arm/Makefile.inc → stand/efi/loader/arch/arm/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/arm/exec.c → stand/efi/loader/arch/arm/exec.c b/sys/boot/efi/loader/arch/arm/exec.c → stand/efi/loader/arch/arm/exec.c
diff --git a/sys/boot/efi/loader/arch/arm/ldscript.arm → stand/efi/loader/arch/arm/ldscript.arm b/sys/boot/efi/loader/arch/arm/ldscript.arm → stand/efi/loader/arch/arm/ldscript.arm
diff --git a/sys/boot/efi/loader/arch/arm/start.S → stand/efi/loader/arch/arm/start.S b/sys/boot/efi/loader/arch/arm/start.S → stand/efi/loader/arch/arm/start.S
diff --git a/sys/boot/efi/loader/arch/arm64/Makefile.inc → stand/efi/loader/arch/arm64/Makefile.inc b/sys/boot/efi/loader/arch/arm64/Makefile.inc → stand/efi/loader/arch/arm64/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/arm64/exec.c → stand/efi/loader/arch/arm64/exec.c b/sys/boot/efi/loader/arch/arm64/exec.c → stand/efi/loader/arch/arm64/exec.c
diff --git a/...boot/efi/loader/arch/arm64/ldscript.arm64 → stand/efi/loader/arch/arm64/ldscript.arm64 b/...boot/efi/loader/arch/arm64/ldscript.arm64 → stand/efi/loader/arch/arm64/ldscript.arm64
diff --git a/sys/boot/efi/loader/arch/arm64/start.S → stand/efi/loader/arch/arm64/start.S b/sys/boot/efi/loader/arch/arm64/start.S → stand/efi/loader/arch/arm64/start.S
diff --git a/sys/boot/efi/loader/arch/i386/Makefile.inc → stand/efi/loader/arch/i386/Makefile.inc b/sys/boot/efi/loader/arch/i386/Makefile.inc → stand/efi/loader/arch/i386/Makefile.inc
diff --git a/sys/boot/efi/loader/arch/i386/bootinfo.c → stand/efi/loader/arch/i386/bootinfo.c b/sys/boot/efi/loader/arch/i386/bootinfo.c → stand/efi/loader/arch/i386/bootinfo.c
diff --git a/sys/boot/efi/loader/arch/i386/efimd.c → stand/efi/loader/arch/i386/efimd.c b/sys/boot/efi/loader/arch/i386/efimd.c → stand/efi/loader/arch/i386/efimd.c
diff --git a/...boot/efi/loader/arch/i386/elf32_freebsd.c → stand/efi/loader/arch/i386/elf32_freebsd.c b/...boot/efi/loader/arch/i386/elf32_freebsd.c → stand/efi/loader/arch/i386/elf32_freebsd.c
diff --git a/sys/boot/efi/loader/arch/i386/exec.c → stand/efi/loader/arch/i386/exec.c b/sys/boot/efi/loader/arch/i386/exec.c → stand/efi/loader/arch/i386/exec.c
diff --git a/sys/boot/efi/loader/arch/i386/i386_copy.c → stand/efi/loader/arch/i386/i386_copy.c b/sys/boot/efi/loader/arch/i386/i386_copy.c → stand/efi/loader/arch/i386/i386_copy.c
diff --git a/sys/boot/efi/loader/arch/i386/ldscript.i386 → stand/efi/loader/arch/i386/ldscript.i386 b/sys/boot/efi/loader/arch/i386/ldscript.i386 → stand/efi/loader/arch/i386/ldscript.i386
diff --git a/sys/boot/efi/loader/arch/i386/start.S → stand/efi/loader/arch/i386/start.S b/sys/boot/efi/loader/arch/i386/start.S → stand/efi/loader/arch/i386/start.S
diff --git a/sys/boot/efi/loader/autoload.c → stand/efi/loader/autoload.c b/sys/boot/efi/loader/autoload.c → stand/efi/loader/autoload.c
diff --git a/sys/boot/efi/loader/bootinfo.c → stand/efi/loader/bootinfo.c b/sys/boot/efi/loader/bootinfo.c → stand/efi/loader/bootinfo.c
diff --git a/sys/boot/efi/loader/conf.c → stand/efi/loader/conf.c b/sys/boot/efi/loader/conf.c → stand/efi/loader/conf.c
diff --git a/sys/boot/efi/loader/copy.c → stand/efi/loader/copy.c b/sys/boot/efi/loader/copy.c → stand/efi/loader/copy.c
diff --git a/sys/boot/efi/loader/efi_main.c → stand/efi/loader/efi_main.c b/sys/boot/efi/loader/efi_main.c → stand/efi/loader/efi_main.c
diff --git a/sys/boot/efi/loader/framebuffer.c → stand/efi/loader/framebuffer.c b/sys/boot/efi/loader/framebuffer.c → stand/efi/loader/framebuffer.c
diff --git a/sys/boot/efi/loader/framebuffer.h → stand/efi/loader/framebuffer.h b/sys/boot/efi/loader/framebuffer.h → stand/efi/loader/framebuffer.h
diff --git a/sys/boot/efi/loader/loader_efi.h → stand/efi/loader/loader_efi.h b/sys/boot/efi/loader/loader_efi.h → stand/efi/loader/loader_efi.h
diff --git a/sys/boot/efi/loader/main.c → stand/efi/loader/main.c b/sys/boot/efi/loader/main.c → stand/efi/loader/main.c
diff --git a/sys/boot/efi/loader/version → stand/efi/loader/version b/sys/boot/efi/loader/version → stand/efi/loader/version
diff --git a/sys/boot/fdt.mk → stand/fdt.mk b/sys/boot/fdt.mk → stand/fdt.mk
diff --git a/sys/boot/fdt/Makefile → stand/fdt/Makefile b/sys/boot/fdt/Makefile → stand/fdt/Makefile
diff --git a/sys/boot/fdt/Makefile.depend → stand/fdt/Makefile.depend b/sys/boot/fdt/Makefile.depend → stand/fdt/Makefile.depend
diff --git a/sys/boot/fdt/fdt_loader_cmd.c → stand/fdt/fdt_loader_cmd.c b/sys/boot/fdt/fdt_loader_cmd.c → stand/fdt/fdt_loader_cmd.c
diff --git a/sys/boot/fdt/fdt_overlay.c → stand/fdt/fdt_overlay.c b/sys/boot/fdt/fdt_overlay.c → stand/fdt/fdt_overlay.c
diff --git a/sys/boot/fdt/fdt_overlay.h → stand/fdt/fdt_overlay.h b/sys/boot/fdt/fdt_overlay.h → stand/fdt/fdt_overlay.h
diff --git a/sys/boot/fdt/fdt_platform.h → stand/fdt/fdt_platform.h b/sys/boot/fdt/fdt_platform.h → stand/fdt/fdt_platform.h
diff --git a/sys/boot/fdt/help.fdt → stand/fdt/help.fdt b/sys/boot/fdt/help.fdt → stand/fdt/help.fdt
diff --git a/sys/boot/ficl.mk → stand/ficl.mk b/sys/boot/ficl.mk → stand/ficl.mk
diff --git a/sys/boot/ficl/Makefile → stand/ficl/Makefile b/sys/boot/ficl/Makefile → stand/ficl/Makefile
diff --git a/sys/boot/ficl/Makefile.depend → stand/ficl/Makefile.depend b/sys/boot/ficl/Makefile.depend → stand/ficl/Makefile.depend
diff --git a/sys/boot/ficl/aarch64/sysdep.c → stand/ficl/aarch64/sysdep.c b/sys/boot/ficl/aarch64/sysdep.c → stand/ficl/aarch64/sysdep.c
diff --git a/sys/boot/ficl/aarch64/sysdep.h → stand/ficl/aarch64/sysdep.h b/sys/boot/ficl/aarch64/sysdep.h → stand/ficl/aarch64/sysdep.h
diff --git a/sys/boot/ficl/amd64/sysdep.c → stand/ficl/amd64/sysdep.c b/sys/boot/ficl/amd64/sysdep.c → stand/ficl/amd64/sysdep.c
diff --git a/sys/boot/ficl/amd64/sysdep.h → stand/ficl/amd64/sysdep.h b/sys/boot/ficl/amd64/sysdep.h → stand/ficl/amd64/sysdep.h
diff --git a/sys/boot/ficl/arm/sysdep.c → stand/ficl/arm/sysdep.c b/sys/boot/ficl/arm/sysdep.c → stand/ficl/arm/sysdep.c
diff --git a/sys/boot/ficl/arm/sysdep.h → stand/ficl/arm/sysdep.h b/sys/boot/ficl/arm/sysdep.h → stand/ficl/arm/sysdep.h
diff --git a/sys/boot/ficl/dict.c → stand/ficl/dict.c b/sys/boot/ficl/dict.c → stand/ficl/dict.c
diff --git a/sys/boot/ficl/ficl.c → stand/ficl/ficl.c b/sys/boot/ficl/ficl.c → stand/ficl/ficl.c
diff --git a/sys/boot/ficl/ficl.h → stand/ficl/ficl.h b/sys/boot/ficl/ficl.h → stand/ficl/ficl.h
diff --git a/sys/boot/ficl/fileaccess.c → stand/ficl/fileaccess.c b/sys/boot/ficl/fileaccess.c → stand/ficl/fileaccess.c
diff --git a/sys/boot/ficl/float.c → stand/ficl/float.c b/sys/boot/ficl/float.c → stand/ficl/float.c
diff --git a/sys/boot/ficl/i386/sysdep.c → stand/ficl/i386/sysdep.c b/sys/boot/ficl/i386/sysdep.c → stand/ficl/i386/sysdep.c
diff --git a/sys/boot/ficl/i386/sysdep.h → stand/ficl/i386/sysdep.h b/sys/boot/ficl/i386/sysdep.h → stand/ficl/i386/sysdep.h
diff --git a/sys/boot/ficl/loader.c → stand/ficl/loader.c b/sys/boot/ficl/loader.c → stand/ficl/loader.c
diff --git a/sys/boot/ficl/math64.c → stand/ficl/math64.c b/sys/boot/ficl/math64.c → stand/ficl/math64.c
diff --git a/sys/boot/ficl/math64.h → stand/ficl/math64.h b/sys/boot/ficl/math64.h → stand/ficl/math64.h
diff --git a/sys/boot/ficl/mips/sysdep.c → stand/ficl/mips/sysdep.c b/sys/boot/ficl/mips/sysdep.c → stand/ficl/mips/sysdep.c
diff --git a/sys/boot/ficl/mips/sysdep.h → stand/ficl/mips/sysdep.h b/sys/boot/ficl/mips/sysdep.h → stand/ficl/mips/sysdep.h
diff --git a/sys/boot/ficl/mips64/sysdep.c → stand/ficl/mips64/sysdep.c b/sys/boot/ficl/mips64/sysdep.c → stand/ficl/mips64/sysdep.c
diff --git a/sys/boot/ficl/mips64/sysdep.h → stand/ficl/mips64/sysdep.h b/sys/boot/ficl/mips64/sysdep.h → stand/ficl/mips64/sysdep.h
diff --git a/sys/boot/ficl/powerpc/sysdep.c → stand/ficl/powerpc/sysdep.c b/sys/boot/ficl/powerpc/sysdep.c → stand/ficl/powerpc/sysdep.c
diff --git a/sys/boot/ficl/powerpc/sysdep.h → stand/ficl/powerpc/sysdep.h b/sys/boot/ficl/powerpc/sysdep.h → stand/ficl/powerpc/sysdep.h
diff --git a/sys/boot/ficl/prefix.c → stand/ficl/prefix.c b/sys/boot/ficl/prefix.c → stand/ficl/prefix.c
diff --git a/sys/boot/ficl/riscv/sysdep.c → stand/ficl/riscv/sysdep.c b/sys/boot/ficl/riscv/sysdep.c → stand/ficl/riscv/sysdep.c
diff --git a/sys/boot/ficl/riscv/sysdep.h → stand/ficl/riscv/sysdep.h b/sys/boot/ficl/riscv/sysdep.h → stand/ficl/riscv/sysdep.h
diff --git a/sys/boot/ficl/search.c → stand/ficl/search.c b/sys/boot/ficl/search.c → stand/ficl/search.c
diff --git a/sys/boot/ficl/softwords/classes.fr → stand/ficl/softwords/classes.fr b/sys/boot/ficl/softwords/classes.fr → stand/ficl/softwords/classes.fr
diff --git a/sys/boot/ficl/softwords/ficlclass.fr → stand/ficl/softwords/ficlclass.fr b/sys/boot/ficl/softwords/ficlclass.fr → stand/ficl/softwords/ficlclass.fr
diff --git a/sys/boot/ficl/softwords/ficllocal.fr → stand/ficl/softwords/ficllocal.fr b/sys/boot/ficl/softwords/ficllocal.fr → stand/ficl/softwords/ficllocal.fr
diff --git a/sys/boot/ficl/softwords/fileaccess.fr → stand/ficl/softwords/fileaccess.fr b/sys/boot/ficl/softwords/fileaccess.fr → stand/ficl/softwords/fileaccess.fr
diff --git a/sys/boot/ficl/softwords/forml.fr → stand/ficl/softwords/forml.fr b/sys/boot/ficl/softwords/forml.fr → stand/ficl/softwords/forml.fr
diff --git a/sys/boot/ficl/softwords/freebsd.fr → stand/ficl/softwords/freebsd.fr b/sys/boot/ficl/softwords/freebsd.fr → stand/ficl/softwords/freebsd.fr
diff --git a/sys/boot/ficl/softwords/ifbrack.fr → stand/ficl/softwords/ifbrack.fr b/sys/boot/ficl/softwords/ifbrack.fr → stand/ficl/softwords/ifbrack.fr
diff --git a/sys/boot/ficl/softwords/jhlocal.fr → stand/ficl/softwords/jhlocal.fr b/sys/boot/ficl/softwords/jhlocal.fr → stand/ficl/softwords/jhlocal.fr
diff --git a/sys/boot/ficl/softwords/marker.fr → stand/ficl/softwords/marker.fr b/sys/boot/ficl/softwords/marker.fr → stand/ficl/softwords/marker.fr
diff --git a/sys/boot/ficl/softwords/oo.fr → stand/ficl/softwords/oo.fr b/sys/boot/ficl/softwords/oo.fr → stand/ficl/softwords/oo.fr
diff --git a/sys/boot/ficl/softwords/prefix.fr → stand/ficl/softwords/prefix.fr b/sys/boot/ficl/softwords/prefix.fr → stand/ficl/softwords/prefix.fr
diff --git a/sys/boot/ficl/softwords/softcore.awk → stand/ficl/softwords/softcore.awk b/sys/boot/ficl/softwords/softcore.awk → stand/ficl/softwords/softcore.awk
diff --git a/sys/boot/ficl/softwords/softcore.fr → stand/ficl/softwords/softcore.fr b/sys/boot/ficl/softwords/softcore.fr → stand/ficl/softwords/softcore.fr
diff --git a/sys/boot/ficl/softwords/string.fr → stand/ficl/softwords/string.fr b/sys/boot/ficl/softwords/string.fr → stand/ficl/softwords/string.fr
diff --git a/sys/boot/ficl/sparc64/sysdep.c → stand/ficl/sparc64/sysdep.c b/sys/boot/ficl/sparc64/sysdep.c → stand/ficl/sparc64/sysdep.c
diff --git a/sys/boot/ficl/sparc64/sysdep.h → stand/ficl/sparc64/sysdep.h b/sys/boot/ficl/sparc64/sysdep.h → stand/ficl/sparc64/sysdep.h
diff --git a/sys/boot/ficl/stack.c → stand/ficl/stack.c b/sys/boot/ficl/stack.c → stand/ficl/stack.c
diff --git a/sys/boot/ficl/testmain.c → stand/ficl/testmain.c b/sys/boot/ficl/testmain.c → stand/ficl/testmain.c
diff --git a/sys/boot/ficl/tools.c → stand/ficl/tools.c b/sys/boot/ficl/tools.c → stand/ficl/tools.c
diff --git a/sys/boot/ficl/unix.c → stand/ficl/unix.c b/sys/boot/ficl/unix.c → stand/ficl/unix.c
diff --git a/sys/boot/ficl/vm.c → stand/ficl/vm.c b/sys/boot/ficl/vm.c → stand/ficl/vm.c
diff --git a/sys/boot/ficl/words.c → stand/ficl/words.c b/sys/boot/ficl/words.c → stand/ficl/words.c
diff --git a/sys/boot/ficl32/Makefile → stand/ficl32/Makefile b/sys/boot/ficl32/Makefile → stand/ficl32/Makefile
diff --git a/sys/boot/ficl32/Makefile.depend → stand/ficl32/Makefile.depend b/sys/boot/ficl32/Makefile.depend → stand/ficl32/Makefile.depend
diff --git a/sys/boot/forth/Makefile → stand/forth/Makefile b/sys/boot/forth/Makefile → stand/forth/Makefile
diff --git a/sys/boot/forth/Makefile.depend → stand/forth/Makefile.depend b/sys/boot/forth/Makefile.depend → stand/forth/Makefile.depend
diff --git a/sys/boot/forth/beastie.4th → stand/forth/beastie.4th b/sys/boot/forth/beastie.4th → stand/forth/beastie.4th
diff --git a/sys/boot/forth/beastie.4th.8 → stand/forth/beastie.4th.8 b/sys/boot/forth/beastie.4th.8 → stand/forth/beastie.4th.8
diff --git a/sys/boot/forth/brand-fbsd.4th → stand/forth/brand-fbsd.4th b/sys/boot/forth/brand-fbsd.4th → stand/forth/brand-fbsd.4th
diff --git a/sys/boot/forth/brand.4th → stand/forth/brand.4th b/sys/boot/forth/brand.4th → stand/forth/brand.4th
diff --git a/sys/boot/forth/brand.4th.8 → stand/forth/brand.4th.8 b/sys/boot/forth/brand.4th.8 → stand/forth/brand.4th.8
diff --git a/sys/boot/forth/check-password.4th → stand/forth/check-password.4th b/sys/boot/forth/check-password.4th → stand/forth/check-password.4th
diff --git a/sys/boot/forth/check-password.4th.8 → stand/forth/check-password.4th.8 b/sys/boot/forth/check-password.4th.8 → stand/forth/check-password.4th.8
diff --git a/sys/boot/forth/color.4th → stand/forth/color.4th b/sys/boot/forth/color.4th → stand/forth/color.4th
diff --git a/sys/boot/forth/color.4th.8 → stand/forth/color.4th.8 b/sys/boot/forth/color.4th.8 → stand/forth/color.4th.8
diff --git a/sys/boot/forth/delay.4th → stand/forth/delay.4th b/sys/boot/forth/delay.4th → stand/forth/delay.4th
diff --git a/sys/boot/forth/delay.4th.8 → stand/forth/delay.4th.8 b/sys/boot/forth/delay.4th.8 → stand/forth/delay.4th.8
diff --git a/sys/boot/forth/efi.4th → stand/forth/efi.4th b/sys/boot/forth/efi.4th → stand/forth/efi.4th
diff --git a/sys/boot/forth/frames.4th → stand/forth/frames.4th b/sys/boot/forth/frames.4th → stand/forth/frames.4th
diff --git a/sys/boot/forth/loader.4th → stand/forth/loader.4th b/sys/boot/forth/loader.4th → stand/forth/loader.4th
diff --git a/sys/boot/forth/loader.4th.8 → stand/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8 → stand/forth/loader.4th.8
diff --git a/sys/boot/forth/loader.conf → stand/forth/loader.conf b/sys/boot/forth/loader.conf → stand/forth/loader.conf
diff --git a/sys/boot/forth/loader.conf.5 → stand/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5 → stand/forth/loader.conf.5
diff --git a/sys/boot/forth/loader.rc → stand/forth/loader.rc b/sys/boot/forth/loader.rc → stand/forth/loader.rc
diff --git a/sys/boot/forth/logo-beastie.4th → stand/forth/logo-beastie.4th b/sys/boot/forth/logo-beastie.4th → stand/forth/logo-beastie.4th
diff --git a/sys/boot/forth/logo-beastiebw.4th → stand/forth/logo-beastiebw.4th b/sys/boot/forth/logo-beastiebw.4th → stand/forth/logo-beastiebw.4th
diff --git a/sys/boot/forth/logo-fbsdbw.4th → stand/forth/logo-fbsdbw.4th b/sys/boot/forth/logo-fbsdbw.4th → stand/forth/logo-fbsdbw.4th
diff --git a/sys/boot/forth/logo-orb.4th → stand/forth/logo-orb.4th b/sys/boot/forth/logo-orb.4th → stand/forth/logo-orb.4th
diff --git a/sys/boot/forth/logo-orbbw.4th → stand/forth/logo-orbbw.4th b/sys/boot/forth/logo-orbbw.4th → stand/forth/logo-orbbw.4th
diff --git a/sys/boot/forth/menu-commands.4th → stand/forth/menu-commands.4th b/sys/boot/forth/menu-commands.4th → stand/forth/menu-commands.4th
diff --git a/sys/boot/forth/menu.4th → stand/forth/menu.4th b/sys/boot/forth/menu.4th → stand/forth/menu.4th
diff --git a/sys/boot/forth/menu.4th.8 → stand/forth/menu.4th.8 b/sys/boot/forth/menu.4th.8 → stand/forth/menu.4th.8
diff --git a/sys/boot/forth/menu.rc → stand/forth/menu.rc b/sys/boot/forth/menu.rc → stand/forth/menu.rc
diff --git a/sys/boot/forth/menusets.4th → stand/forth/menusets.4th b/sys/boot/forth/menusets.4th → stand/forth/menusets.4th
diff --git a/sys/boot/forth/menusets.4th.8 → stand/forth/menusets.4th.8 b/sys/boot/forth/menusets.4th.8 → stand/forth/menusets.4th.8
diff --git a/sys/boot/forth/pcibios.4th → stand/forth/pcibios.4th b/sys/boot/forth/pcibios.4th → stand/forth/pcibios.4th
diff --git a/sys/boot/forth/pnp.4th → stand/forth/pnp.4th b/sys/boot/forth/pnp.4th → 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/common/bootstrap.h
 	ptr pnpi.desc
 	int pnpi.revision
 	ptr pnpi.module				\ (char*) module args

diff --git a/sys/boot/forth/screen.4th → stand/forth/screen.4th b/sys/boot/forth/screen.4th → stand/forth/screen.4th
diff --git a/sys/boot/forth/shortcuts.4th → stand/forth/shortcuts.4th b/sys/boot/forth/shortcuts.4th → stand/forth/shortcuts.4th
diff --git a/sys/boot/forth/support.4th → stand/forth/support.4th b/sys/boot/forth/support.4th → 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 → stand/forth/version.4th b/sys/boot/forth/version.4th → stand/forth/version.4th
diff --git a/sys/boot/forth/version.4th.8 → stand/forth/version.4th.8 b/sys/boot/forth/version.4th.8 → stand/forth/version.4th.8
diff --git a/sys/boot/geli/Makefile → stand/geli/Makefile b/sys/boot/geli/Makefile → stand/geli/Makefile
diff --git a/sys/boot/geli/Makefile.depend → stand/geli/Makefile.depend b/sys/boot/geli/Makefile.depend → stand/geli/Makefile.depend
diff --git a/sys/boot/geli/geliboot.c → stand/geli/geliboot.c b/sys/boot/geli/geliboot.c → stand/geli/geliboot.c
diff --git a/sys/boot/geli/geliboot.h → stand/geli/geliboot.h b/sys/boot/geli/geliboot.h → stand/geli/geliboot.h
diff --git a/sys/boot/geli/geliboot_crypto.c → stand/geli/geliboot_crypto.c b/sys/boot/geli/geliboot_crypto.c → stand/geli/geliboot_crypto.c
diff --git a/sys/boot/geli/geliboot_internal.h → stand/geli/geliboot_internal.h b/sys/boot/geli/geliboot_internal.h → stand/geli/geliboot_internal.h
diff --git a/sys/boot/geli/pwgets.c → stand/geli/pwgets.c b/sys/boot/geli/pwgets.c → stand/geli/pwgets.c
diff --git a/sys/boot/i386/Makefile → stand/i386/Makefile b/sys/boot/i386/Makefile → stand/i386/Makefile
diff --git a/sys/boot/i386/Makefile.inc → stand/i386/Makefile.inc b/sys/boot/i386/Makefile.inc → 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 → stand/i386/boot.ldscript b/sys/boot/i386/boot.ldscript → stand/i386/boot.ldscript
diff --git a/sys/boot/i386/boot0/Makefile → stand/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile → stand/i386/boot0/Makefile
diff --git a/sys/boot/i386/boot0/Makefile.depend → stand/i386/boot0/Makefile.depend b/sys/boot/i386/boot0/Makefile.depend → stand/i386/boot0/Makefile.depend
diff --git a/sys/boot/i386/boot0/boot0.S → stand/i386/boot0/boot0.S b/sys/boot/i386/boot0/boot0.S → stand/i386/boot0/boot0.S
diff --git a/sys/boot/i386/boot0sio/Makefile → stand/i386/boot0sio/Makefile b/sys/boot/i386/boot0sio/Makefile → stand/i386/boot0sio/Makefile
diff --git a/sys/boot/i386/boot0sio/Makefile.depend → stand/i386/boot0sio/Makefile.depend b/sys/boot/i386/boot0sio/Makefile.depend → stand/i386/boot0sio/Makefile.depend
diff --git a/sys/boot/i386/boot2/Makefile → stand/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile → stand/i386/boot2/Makefile
diff --git a/sys/boot/i386/boot2/Makefile.depend → stand/i386/boot2/Makefile.depend b/sys/boot/i386/boot2/Makefile.depend → stand/i386/boot2/Makefile.depend
@@ -3,8 +3,8 @@
 
 DIRDEPS = \
 	include \
-	sys/boot/i386/btx/btx \
-	sys/boot/i386/btx/lib \
+	stand/i386/btx/btx \
+	stand/i386/btx/lib \
 
 
 .include <dirdeps.mk>

diff --git a/sys/boot/i386/boot2/boot1.S → stand/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S → stand/i386/boot2/boot1.S
diff --git a/sys/boot/i386/boot2/boot2.c → stand/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c → stand/i386/boot2/boot2.c
diff --git a/sys/boot/i386/boot2/lib.h → stand/i386/boot2/lib.h b/sys/boot/i386/boot2/lib.h → stand/i386/boot2/lib.h
diff --git a/sys/boot/i386/boot2/sio.S → stand/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S → stand/i386/boot2/sio.S
diff --git a/sys/boot/i386/btx/Makefile → stand/i386/btx/Makefile b/sys/boot/i386/btx/Makefile → stand/i386/btx/Makefile
diff --git a/sys/boot/i386/btx/Makefile.inc → stand/i386/btx/Makefile.inc b/sys/boot/i386/btx/Makefile.inc → stand/i386/btx/Makefile.inc
diff --git a/sys/boot/i386/btx/btx/Makefile → stand/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile → stand/i386/btx/btx/Makefile
diff --git a/sys/boot/i386/btx/btx/Makefile.depend → stand/i386/btx/btx/Makefile.depend b/sys/boot/i386/btx/btx/Makefile.depend → stand/i386/btx/btx/Makefile.depend
diff --git a/sys/boot/i386/btx/btx/btx.S → stand/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S → stand/i386/btx/btx/btx.S