From ca987d4641cdcd7f27e153db17c5bf064934faf5 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 14 Nov 2017 23:02:19 +0000 Subject: [PATCH] Move sys/boot to stand. Fix all references to new location Sponsored by: Netflix --- MAINTAINERS | 2 +- Makefile.inc1 | 5 +- lib/libefivar/Makefile | 2 +- release/arm64/PINE64.conf | 2 +- release/arm64/RPI3.conf | 2 +- release/powerpc/generate-hfs.sh | 2 +- release/tools/vmimage.subr | 2 +- share/examples/bootforth/README | 2 +- share/examples/etc/make.conf | 2 +- share/man/man5/make.conf.5 | 4 +- share/man/man8/diskless.8 | 2 +- {sys/boot => stand}/Makefile | 0 {sys/boot => stand}/Makefile.amd64 | 0 {sys/boot => stand}/Makefile.arm | 0 {sys/boot => stand}/Makefile.arm64 | 0 {sys/boot => stand}/Makefile.i386 | 0 {sys/boot => stand}/Makefile.inc | 0 {sys/boot => stand}/Makefile.mips | 0 {sys/boot => stand}/Makefile.powerpc | 0 {sys/boot => stand}/Makefile.sparc64 | 0 {sys/boot => stand}/arm/Makefile | 0 {sys/boot => stand}/arm/Makefile.inc | 0 {sys/boot => stand}/arm/loader/loader.conf | 0 {sys/boot => stand}/arm/uboot/Makefile | 0 {sys/boot => stand}/arm/uboot/conf.c | 0 {sys/boot => stand}/arm/uboot/help.uboot | 0 {sys/boot => stand}/arm/uboot/ldscript.arm | 0 {sys/boot => stand}/arm/uboot/start.S | 0 {sys/boot => stand}/arm/uboot/version | 0 {sys/boot => stand}/arm64/Makefile | 0 {sys/boot => stand}/arm64/libarm64/cache.c | 0 {sys/boot => stand}/arm64/libarm64/cache.h | 0 {sys/boot => stand}/common/Makefile.depend | 0 {sys/boot => stand}/common/bcache.c | 0 {sys/boot => stand}/common/boot.c | 0 {sys/boot => stand}/common/bootstrap.h | 0 {sys/boot => stand}/common/commands.c | 0 {sys/boot => stand}/common/console.c | 0 {sys/boot => stand}/common/dev_net.c | 0 {sys/boot => stand}/common/dev_net.h | 0 {sys/boot => stand}/common/devopen.c | 0 {sys/boot => stand}/common/disk.c | 0 {sys/boot => stand}/common/disk.h | 0 {sys/boot => stand}/common/help.common | 0 {sys/boot => stand}/common/install.c | 0 {sys/boot => stand}/common/interp.c | 0 {sys/boot => stand}/common/interp_backslash.c | 0 {sys/boot => stand}/common/interp_forth.c | 0 {sys/boot => stand}/common/interp_parse.c | 0 {sys/boot => stand}/common/isapnp.c | 0 {sys/boot => stand}/common/isapnp.h | 0 {sys/boot => stand}/common/load_elf.c | 0 {sys/boot => stand}/common/load_elf32.c | 0 {sys/boot => stand}/common/load_elf32_obj.c | 0 {sys/boot => stand}/common/load_elf64.c | 0 {sys/boot => stand}/common/load_elf64_obj.c | 0 {sys/boot => stand}/common/load_elf_obj.c | 0 {sys/boot => stand}/common/ls.c | 0 {sys/boot => stand}/common/md.c | 0 {sys/boot => stand}/common/merge_help.awk | 0 {sys/boot => stand}/common/misc.c | 0 {sys/boot => stand}/common/module.c | 0 {sys/boot => stand}/common/newvers.sh | 0 {sys/boot => stand}/common/part.c | 0 {sys/boot => stand}/common/part.h | 0 {sys/boot => stand}/common/paths.h | 0 {sys/boot => stand}/common/pnp.c | 0 {sys/boot => stand}/common/rbx.h | 0 {sys/boot => stand}/common/reloc_elf.c | 0 {sys/boot => stand}/common/reloc_elf32.c | 0 {sys/boot => stand}/common/reloc_elf64.c | 0 {sys/boot => stand}/common/self_reloc.c | 0 {sys/boot => stand}/defs.mk | 4 +- {sys/boot => stand}/efi/Makefile | 0 {sys/boot => stand}/efi/Makefile.inc | 0 {sys/boot => stand}/efi/boot1/Makefile | 0 {sys/boot => stand}/efi/boot1/Makefile.depend | 6 +- {sys/boot => stand}/efi/boot1/Makefile.fat | 0 {sys/boot => stand}/efi/boot1/boot1.c | 0 {sys/boot => stand}/efi/boot1/boot_module.h | 0 .../efi/boot1/fat-amd64.tmpl.xz | Bin {sys/boot => stand}/efi/boot1/fat-arm.tmpl.xz | Bin .../efi/boot1/fat-arm64.tmpl.xz | Bin .../boot => stand}/efi/boot1/fat-i386.tmpl.xz | Bin {sys/boot => stand}/efi/boot1/generate-fat.sh | 0 {sys/boot => stand}/efi/boot1/ufs_module.c | 0 {sys/boot => stand}/efi/boot1/zfs_module.c | 0 {sys/boot => stand}/efi/fdt/Makefile | 0 {sys/boot => stand}/efi/fdt/Makefile.depend | 0 {sys/boot => stand}/efi/fdt/efi_fdt.c | 0 {sys/boot => stand}/efi/include/README | 0 .../efi/include/amd64/efibind.h | 0 {sys/boot => stand}/efi/include/amd64/pe.h | 0 {sys/boot => stand}/efi/include/arm/efibind.h | 0 .../efi/include/arm64/efibind.h | 0 {sys/boot => stand}/efi/include/efi.h | 0 .../efi/include/efi_driver_utils.h | 0 {sys/boot => stand}/efi/include/efi_drivers.h | 0 {sys/boot => stand}/efi/include/efi_nii.h | 0 {sys/boot => stand}/efi/include/efiapi.h | 0 {sys/boot => stand}/efi/include/efichar.h | 0 {sys/boot => stand}/efi/include/eficon.h | 0 {sys/boot => stand}/efi/include/eficonsctl.h | 0 {sys/boot => stand}/efi/include/efidebug.h | 0 {sys/boot => stand}/efi/include/efidef.h | 0 {sys/boot => stand}/efi/include/efidevp.h | 0 {sys/boot => stand}/efi/include/efierr.h | 0 {sys/boot => stand}/efi/include/efifpswa.h | 0 {sys/boot => stand}/efi/include/efifs.h | 0 {sys/boot => stand}/efi/include/efigop.h | 0 {sys/boot => stand}/efi/include/efilib.h | 0 {sys/boot => stand}/efi/include/efinet.h | 0 {sys/boot => stand}/efi/include/efipart.h | 0 {sys/boot => stand}/efi/include/efipciio.h | 0 {sys/boot => stand}/efi/include/efiprot.h | 0 {sys/boot => stand}/efi/include/efipxebc.h | 0 {sys/boot => stand}/efi/include/efiser.h | 0 {sys/boot => stand}/efi/include/efistdarg.h | 0 {sys/boot => stand}/efi/include/efiuga.h | 0 {sys/boot => stand}/efi/include/efizfs.h | 0 .../boot => stand}/efi/include/i386/efibind.h | 0 {sys/boot => stand}/efi/include/i386/pe.h | 0 {sys/boot => stand}/efi/libefi/Makefile | 0 .../boot => stand}/efi/libefi/Makefile.depend | 0 {sys/boot => stand}/efi/libefi/delay.c | 0 {sys/boot => stand}/efi/libefi/devicename.c | 0 {sys/boot => stand}/efi/libefi/devpath.c | 0 {sys/boot => stand}/efi/libefi/efi_console.c | 0 .../efi/libefi/efi_driver_utils.c | 0 {sys/boot => stand}/efi/libefi/efichar.c | 0 {sys/boot => stand}/efi/libefi/efinet.c | 0 {sys/boot => stand}/efi/libefi/efipart.c | 0 {sys/boot => stand}/efi/libefi/efizfs.c | 0 {sys/boot => stand}/efi/libefi/env.c | 0 {sys/boot => stand}/efi/libefi/errno.c | 0 {sys/boot => stand}/efi/libefi/handles.c | 0 {sys/boot => stand}/efi/libefi/libefi.c | 0 {sys/boot => stand}/efi/libefi/time.c | 0 {sys/boot => stand}/efi/libefi/time_event.c | 0 {sys/boot => stand}/efi/libefi/wchar.c | 0 {sys/boot => stand}/efi/loader/Makefile | 0 .../boot => stand}/efi/loader/Makefile.depend | 8 +-- .../efi/loader/arch/amd64/Makefile.inc | 0 .../efi/loader/arch/amd64/amd64_tramp.S | 0 .../efi/loader/arch/amd64/elf64_freebsd.c | 0 .../efi/loader/arch/amd64/exc.S | 0 .../efi/loader/arch/amd64/ldscript.amd64 | 0 .../efi/loader/arch/amd64/start.S | 0 .../efi/loader/arch/amd64/trap.c | 0 .../efi/loader/arch/arm/Makefile.inc | 0 .../boot => stand}/efi/loader/arch/arm/exec.c | 0 .../efi/loader/arch/arm/ldscript.arm | 0 .../efi/loader/arch/arm/start.S | 0 .../efi/loader/arch/arm64/Makefile.inc | 0 .../efi/loader/arch/arm64/exec.c | 0 .../efi/loader/arch/arm64/ldscript.arm64 | 0 .../efi/loader/arch/arm64/start.S | 0 .../efi/loader/arch/i386/Makefile.inc | 0 .../efi/loader/arch/i386/bootinfo.c | 0 .../efi/loader/arch/i386/efimd.c | 0 .../efi/loader/arch/i386/elf32_freebsd.c | 0 .../efi/loader/arch/i386/exec.c | 0 .../efi/loader/arch/i386/i386_copy.c | 0 .../efi/loader/arch/i386/ldscript.i386 | 0 .../efi/loader/arch/i386/start.S | 0 {sys/boot => stand}/efi/loader/autoload.c | 0 {sys/boot => stand}/efi/loader/bootinfo.c | 0 {sys/boot => stand}/efi/loader/conf.c | 0 {sys/boot => stand}/efi/loader/copy.c | 0 {sys/boot => stand}/efi/loader/efi_main.c | 0 {sys/boot => stand}/efi/loader/framebuffer.c | 0 {sys/boot => stand}/efi/loader/framebuffer.h | 0 {sys/boot => stand}/efi/loader/loader_efi.h | 0 {sys/boot => stand}/efi/loader/main.c | 0 {sys/boot => stand}/efi/loader/version | 0 {sys/boot => stand}/fdt.mk | 0 {sys/boot => stand}/fdt/Makefile | 0 {sys/boot => stand}/fdt/Makefile.depend | 0 {sys/boot => stand}/fdt/fdt_loader_cmd.c | 0 {sys/boot => stand}/fdt/fdt_overlay.c | 0 {sys/boot => stand}/fdt/fdt_overlay.h | 0 {sys/boot => stand}/fdt/fdt_platform.h | 0 {sys/boot => stand}/fdt/help.fdt | 0 {sys/boot => stand}/ficl.mk | 0 {sys/boot => stand}/ficl/Makefile | 0 {sys/boot => stand}/ficl/Makefile.depend | 0 {sys/boot => stand}/ficl/aarch64/sysdep.c | 0 {sys/boot => stand}/ficl/aarch64/sysdep.h | 0 {sys/boot => stand}/ficl/amd64/sysdep.c | 0 {sys/boot => stand}/ficl/amd64/sysdep.h | 0 {sys/boot => stand}/ficl/arm/sysdep.c | 0 {sys/boot => stand}/ficl/arm/sysdep.h | 0 {sys/boot => stand}/ficl/dict.c | 0 {sys/boot => stand}/ficl/ficl.c | 0 {sys/boot => stand}/ficl/ficl.h | 0 {sys/boot => stand}/ficl/fileaccess.c | 0 {sys/boot => stand}/ficl/float.c | 0 {sys/boot => stand}/ficl/i386/sysdep.c | 0 {sys/boot => stand}/ficl/i386/sysdep.h | 0 {sys/boot => stand}/ficl/loader.c | 0 {sys/boot => stand}/ficl/math64.c | 0 {sys/boot => stand}/ficl/math64.h | 0 {sys/boot => stand}/ficl/mips/sysdep.c | 0 {sys/boot => stand}/ficl/mips/sysdep.h | 0 {sys/boot => stand}/ficl/mips64/sysdep.c | 0 {sys/boot => stand}/ficl/mips64/sysdep.h | 0 {sys/boot => stand}/ficl/powerpc/sysdep.c | 0 {sys/boot => stand}/ficl/powerpc/sysdep.h | 0 {sys/boot => stand}/ficl/prefix.c | 0 {sys/boot => stand}/ficl/riscv/sysdep.c | 0 {sys/boot => stand}/ficl/riscv/sysdep.h | 0 {sys/boot => stand}/ficl/search.c | 0 {sys/boot => stand}/ficl/softwords/classes.fr | 0 .../ficl/softwords/ficlclass.fr | 0 .../ficl/softwords/ficllocal.fr | 0 .../ficl/softwords/fileaccess.fr | 0 {sys/boot => stand}/ficl/softwords/forml.fr | 0 {sys/boot => stand}/ficl/softwords/freebsd.fr | 0 {sys/boot => stand}/ficl/softwords/ifbrack.fr | 0 {sys/boot => stand}/ficl/softwords/jhlocal.fr | 0 {sys/boot => stand}/ficl/softwords/marker.fr | 0 {sys/boot => stand}/ficl/softwords/oo.fr | 0 {sys/boot => stand}/ficl/softwords/prefix.fr | 0 .../ficl/softwords/softcore.awk | 0 .../boot => stand}/ficl/softwords/softcore.fr | 0 {sys/boot => stand}/ficl/softwords/string.fr | 0 {sys/boot => stand}/ficl/sparc64/sysdep.c | 0 {sys/boot => stand}/ficl/sparc64/sysdep.h | 0 {sys/boot => stand}/ficl/stack.c | 0 {sys/boot => stand}/ficl/testmain.c | 0 {sys/boot => stand}/ficl/tools.c | 0 {sys/boot => stand}/ficl/unix.c | 0 {sys/boot => stand}/ficl/vm.c | 0 {sys/boot => stand}/ficl/words.c | 0 {sys/boot => stand}/ficl32/Makefile | 0 {sys/boot => stand}/ficl32/Makefile.depend | 0 {sys/boot => stand}/forth/Makefile | 0 {sys/boot => stand}/forth/Makefile.depend | 0 {sys/boot => stand}/forth/beastie.4th | 0 {sys/boot => stand}/forth/beastie.4th.8 | 0 {sys/boot => stand}/forth/brand-fbsd.4th | 0 {sys/boot => stand}/forth/brand.4th | 0 {sys/boot => stand}/forth/brand.4th.8 | 0 {sys/boot => stand}/forth/check-password.4th | 0 .../boot => stand}/forth/check-password.4th.8 | 0 {sys/boot => stand}/forth/color.4th | 0 {sys/boot => stand}/forth/color.4th.8 | 0 {sys/boot => stand}/forth/delay.4th | 0 {sys/boot => stand}/forth/delay.4th.8 | 0 {sys/boot => stand}/forth/efi.4th | 0 {sys/boot => stand}/forth/frames.4th | 0 {sys/boot => stand}/forth/loader.4th | 0 {sys/boot => stand}/forth/loader.4th.8 | 0 {sys/boot => stand}/forth/loader.conf | 0 {sys/boot => stand}/forth/loader.conf.5 | 0 {sys/boot => stand}/forth/loader.rc | 0 {sys/boot => stand}/forth/logo-beastie.4th | 0 {sys/boot => stand}/forth/logo-beastiebw.4th | 0 {sys/boot => stand}/forth/logo-fbsdbw.4th | 0 {sys/boot => stand}/forth/logo-orb.4th | 0 {sys/boot => stand}/forth/logo-orbbw.4th | 0 {sys/boot => stand}/forth/menu-commands.4th | 0 {sys/boot => stand}/forth/menu.4th | 0 {sys/boot => stand}/forth/menu.4th.8 | 0 {sys/boot => stand}/forth/menu.rc | 0 {sys/boot => stand}/forth/menusets.4th | 0 {sys/boot => stand}/forth/menusets.4th.8 | 0 {sys/boot => stand}/forth/pcibios.4th | 0 {sys/boot => stand}/forth/pnp.4th | 2 +- {sys/boot => stand}/forth/screen.4th | 0 {sys/boot => stand}/forth/shortcuts.4th | 0 {sys/boot => stand}/forth/support.4th | 2 +- {sys/boot => stand}/forth/version.4th | 0 {sys/boot => stand}/forth/version.4th.8 | 0 {sys/boot => stand}/geli/Makefile | 0 {sys/boot => stand}/geli/Makefile.depend | 0 {sys/boot => stand}/geli/geliboot.c | 0 {sys/boot => stand}/geli/geliboot.h | 0 {sys/boot => stand}/geli/geliboot_crypto.c | 0 {sys/boot => stand}/geli/geliboot_internal.h | 0 {sys/boot => stand}/geli/pwgets.c | 0 {sys/boot => stand}/i386/Makefile | 0 {sys/boot => stand}/i386/Makefile.inc | 2 +- {sys/boot => stand}/i386/boot.ldscript | 0 {sys/boot => stand}/i386/boot0/Makefile | 0 .../boot => stand}/i386/boot0/Makefile.depend | 0 {sys/boot => stand}/i386/boot0/boot0.S | 0 {sys/boot => stand}/i386/boot0sio/Makefile | 0 .../i386/boot0sio/Makefile.depend | 0 {sys/boot => stand}/i386/boot2/Makefile | 0 .../boot => stand}/i386/boot2/Makefile.depend | 4 +- {sys/boot => stand}/i386/boot2/boot1.S | 0 {sys/boot => stand}/i386/boot2/boot2.c | 0 {sys/boot => stand}/i386/boot2/lib.h | 0 {sys/boot => stand}/i386/boot2/sio.S | 0 {sys/boot => stand}/i386/btx/Makefile | 0 {sys/boot => stand}/i386/btx/Makefile.inc | 0 {sys/boot => stand}/i386/btx/btx/Makefile | 0 .../i386/btx/btx/Makefile.depend | 0 {sys/boot => stand}/i386/btx/btx/btx.S | 0 {sys/boot => stand}/i386/btx/btxldr/Makefile | 0 .../i386/btx/btxldr/Makefile.depend | 0 {sys/boot => stand}/i386/btx/btxldr/btxldr.S | 0 {sys/boot => stand}/i386/btx/lib/Makefile | 0 .../i386/btx/lib/Makefile.depend | 0 {sys/boot => stand}/i386/btx/lib/btxcsu.S | 0 {sys/boot => stand}/i386/btx/lib/btxsys.s | 0 {sys/boot => stand}/i386/btx/lib/btxv86.h | 0 {sys/boot => stand}/i386/btx/lib/btxv86.s | 0 {sys/boot => stand}/i386/cdboot/Makefile | 0 .../i386/cdboot/Makefile.depend | 0 {sys/boot => stand}/i386/cdboot/cdboot.S | 0 {sys/boot => stand}/i386/common/bootargs.h | 0 {sys/boot => stand}/i386/common/cons.c | 0 {sys/boot => stand}/i386/common/cons.h | 0 {sys/boot => stand}/i386/common/drv.c | 0 {sys/boot => stand}/i386/common/drv.h | 0 {sys/boot => stand}/i386/common/edd.h | 0 {sys/boot => stand}/i386/gptboot/Makefile | 0 .../i386/gptboot/Makefile.depend | 8 +-- {sys/boot => stand}/i386/gptboot/gptboot.8 | 0 {sys/boot => stand}/i386/gptboot/gptboot.c | 0 {sys/boot => stand}/i386/gptboot/gptldr.S | 0 {sys/boot => stand}/i386/gptzfsboot/Makefile | 0 .../i386/gptzfsboot/Makefile.depend | 10 +-- .../i386/gptzfsboot/gptzfsboot.8 | 0 {sys/boot => stand}/i386/kgzldr/Makefile | 0 .../i386/kgzldr/Makefile.depend | 0 {sys/boot => stand}/i386/kgzldr/boot.c | 0 {sys/boot => stand}/i386/kgzldr/crt.s | 0 {sys/boot => stand}/i386/kgzldr/kgzldr.h | 0 {sys/boot => stand}/i386/kgzldr/lib.c | 0 {sys/boot => stand}/i386/kgzldr/sio.s | 0 {sys/boot => stand}/i386/kgzldr/start.s | 0 {sys/boot => stand}/i386/libfirewire/Makefile | 0 .../i386/libfirewire/Makefile.depend | 0 .../i386/libfirewire/dconsole.c | 0 .../i386/libfirewire/firewire.c | 0 {sys/boot => stand}/i386/libfirewire/fwohci.c | 0 {sys/boot => stand}/i386/libfirewire/fwohci.h | 0 .../i386/libfirewire/fwohcireg.h | 0 {sys/boot => stand}/i386/libi386/Makefile | 0 .../i386/libi386/Makefile.depend | 0 .../boot => stand}/i386/libi386/amd64_tramp.S | 0 {sys/boot => stand}/i386/libi386/biosacpi.c | 0 {sys/boot => stand}/i386/libi386/bioscd.c | 0 {sys/boot => stand}/i386/libi386/biosdisk.c | 0 {sys/boot => stand}/i386/libi386/biosmem.c | 0 {sys/boot => stand}/i386/libi386/biospci.c | 0 {sys/boot => stand}/i386/libi386/biospnp.c | 0 {sys/boot => stand}/i386/libi386/biossmap.c | 0 {sys/boot => stand}/i386/libi386/bootinfo.c | 0 {sys/boot => stand}/i386/libi386/bootinfo32.c | 0 {sys/boot => stand}/i386/libi386/bootinfo64.c | 0 {sys/boot => stand}/i386/libi386/comconsole.c | 0 {sys/boot => stand}/i386/libi386/devicename.c | 0 .../i386/libi386/elf32_freebsd.c | 0 .../i386/libi386/elf64_freebsd.c | 0 {sys/boot => stand}/i386/libi386/i386_copy.c | 0 .../boot => stand}/i386/libi386/i386_module.c | 0 {sys/boot => stand}/i386/libi386/libi386.h | 0 {sys/boot => stand}/i386/libi386/multiboot.c | 0 {sys/boot => stand}/i386/libi386/multiboot.h | 0 .../i386/libi386/multiboot_tramp.S | 0 .../boot => stand}/i386/libi386/nullconsole.c | 0 {sys/boot => stand}/i386/libi386/pread.c | 0 {sys/boot => stand}/i386/libi386/pxe.c | 0 {sys/boot => stand}/i386/libi386/pxe.h | 0 {sys/boot => stand}/i386/libi386/pxetramp.s | 0 .../i386/libi386/relocater_tramp.S | 0 {sys/boot => stand}/i386/libi386/smbios.c | 0 {sys/boot => stand}/i386/libi386/smbios.h | 0 .../boot => stand}/i386/libi386/spinconsole.c | 0 {sys/boot => stand}/i386/libi386/time.c | 0 {sys/boot => stand}/i386/libi386/vidconsole.c | 0 {sys/boot => stand}/i386/loader/Makefile | 0 stand/i386/loader/Makefile.depend | 20 ++++++ {sys/boot => stand}/i386/loader/chain.c | 0 {sys/boot => stand}/i386/loader/conf.c | 0 {sys/boot => stand}/i386/loader/help.i386 | 0 {sys/boot => stand}/i386/loader/loader.rc | 0 {sys/boot => stand}/i386/loader/main.c | 0 {sys/boot => stand}/i386/loader/version | 0 {sys/boot => stand}/i386/mbr/Makefile | 0 {sys/boot => stand}/i386/mbr/Makefile.depend | 0 {sys/boot => stand}/i386/mbr/mbr.s | 0 {sys/boot => stand}/i386/pmbr/Makefile | 0 {sys/boot => stand}/i386/pmbr/Makefile.depend | 0 {sys/boot => stand}/i386/pmbr/pmbr.s | 0 {sys/boot => stand}/i386/pxeldr/Makefile | 0 .../i386/pxeldr/Makefile.depend | 6 +- {sys/boot => stand}/i386/pxeldr/pxeboot.8 | 0 {sys/boot => stand}/i386/pxeldr/pxeldr.S | 0 {sys/boot => stand}/i386/zfsboot/Makefile | 0 .../i386/zfsboot/Makefile.depend | 8 +-- {sys/boot => stand}/i386/zfsboot/zfsboot.8 | 0 {sys/boot => stand}/i386/zfsboot/zfsboot.c | 0 {sys/boot => stand}/i386/zfsboot/zfsldr.S | 0 {sys/boot => stand}/i386/zfsloader/Makefile | 0 stand/i386/zfsloader/Makefile.depend | 21 ++++++ {sys/boot => stand}/kshim/bsd_busspace.c | 0 {sys/boot => stand}/kshim/bsd_global.h | 0 {sys/boot => stand}/kshim/bsd_kernel.c | 0 {sys/boot => stand}/kshim/bsd_kernel.h | 0 {sys/boot => stand}/kshim/kshim.mk | 0 {sys/boot => stand}/kshim/sysinit.h | 0 {sys/boot => stand}/libsa/Makefile | 0 {sys/boot => stand}/libsa/Makefile.depend | 0 {sys/boot => stand}/libsa/__main.c | 0 {sys/boot => stand}/libsa/amd64/_setjmp.S | 0 {sys/boot => stand}/libsa/arp.c | 0 {sys/boot => stand}/libsa/assert.c | 0 {sys/boot => stand}/libsa/bcd.c | 0 {sys/boot => stand}/libsa/bootp.c | 0 {sys/boot => stand}/libsa/bootp.h | 0 {sys/boot => stand}/libsa/bootparam.c | 0 {sys/boot => stand}/libsa/bootparam.h | 0 {sys/boot => stand}/libsa/bzipfs.c | 0 {sys/boot => stand}/libsa/cd9660.c | 0 {sys/boot => stand}/libsa/close.c | 0 {sys/boot => stand}/libsa/closeall.c | 0 {sys/boot => stand}/libsa/crc32.c | 0 {sys/boot => stand}/libsa/crc32.h | 0 {sys/boot => stand}/libsa/dev.c | 0 {sys/boot => stand}/libsa/dosfs.c | 0 {sys/boot => stand}/libsa/dosfs.h | 0 {sys/boot => stand}/libsa/environment.c | 0 {sys/boot => stand}/libsa/ether.c | 0 {sys/boot => stand}/libsa/ext2fs.c | 0 {sys/boot => stand}/libsa/fstat.c | 0 {sys/boot => stand}/libsa/getopt.c | 0 {sys/boot => stand}/libsa/gets.c | 0 {sys/boot => stand}/libsa/globals.c | 0 {sys/boot => stand}/libsa/gpt.c | 0 {sys/boot => stand}/libsa/gpt.h | 0 {sys/boot => stand}/libsa/gzipfs.c | 0 {sys/boot => stand}/libsa/i386/_setjmp.S | 0 {sys/boot => stand}/libsa/in_cksum.c | 0 {sys/boot => stand}/libsa/inet_ntoa.c | 0 {sys/boot => stand}/libsa/ioctl.c | 0 {sys/boot => stand}/libsa/iodesc.h | 0 {sys/boot => stand}/libsa/ip.c | 0 {sys/boot => stand}/libsa/libstand.3 | 0 {sys/boot => stand}/libsa/lseek.c | 0 {sys/boot => stand}/libsa/mips/_setjmp.S | 0 {sys/boot => stand}/libsa/nandfs.c | 0 {sys/boot => stand}/libsa/net.c | 0 {sys/boot => stand}/libsa/net.h | 0 {sys/boot => stand}/libsa/netif.c | 0 {sys/boot => stand}/libsa/netif.h | 0 {sys/boot => stand}/libsa/nfs.c | 0 {sys/boot => stand}/libsa/nfsv2.h | 0 {sys/boot => stand}/libsa/nullfs.c | 0 {sys/boot => stand}/libsa/open.c | 0 {sys/boot => stand}/libsa/pager.c | 0 {sys/boot => stand}/libsa/panic.c | 0 {sys/boot => stand}/libsa/pkgfs.c | 0 {sys/boot => stand}/libsa/powerpc/_setjmp.S | 0 .../boot => stand}/libsa/powerpc/syncicache.c | 0 {sys/boot => stand}/libsa/printf.c | 0 {sys/boot => stand}/libsa/qdivrem.c | 0 {sys/boot => stand}/libsa/quad.h | 0 {sys/boot => stand}/libsa/random.c | 0 {sys/boot => stand}/libsa/rarp.c | 0 {sys/boot => stand}/libsa/read.c | 0 {sys/boot => stand}/libsa/readdir.c | 0 {sys/boot => stand}/libsa/rpc.c | 0 {sys/boot => stand}/libsa/rpc.h | 0 {sys/boot => stand}/libsa/rpcv2.h | 0 {sys/boot => stand}/libsa/saioctl.h | 0 {sys/boot => stand}/libsa/sbrk.c | 0 {sys/boot => stand}/libsa/sparc64/_setjmp.S | 0 {sys/boot => stand}/libsa/splitfs.c | 0 {sys/boot => stand}/libsa/stand.h | 0 {sys/boot => stand}/libsa/stat.c | 0 {sys/boot => stand}/libsa/strcasecmp.c | 0 {sys/boot => stand}/libsa/strdup.c | 0 {sys/boot => stand}/libsa/strerror.c | 0 {sys/boot => stand}/libsa/strtol.c | 0 {sys/boot => stand}/libsa/strtoul.c | 0 {sys/boot => stand}/libsa/tftp.c | 0 {sys/boot => stand}/libsa/tftp.h | 0 {sys/boot => stand}/libsa/twiddle.c | 0 {sys/boot => stand}/libsa/udp.c | 0 {sys/boot => stand}/libsa/ufs.c | 0 {sys/boot => stand}/libsa/ufsread.c | 0 {sys/boot => stand}/libsa/util.c | 0 {sys/boot => stand}/libsa/util.h | 0 {sys/boot => stand}/libsa/uuid_from_string.c | 0 {sys/boot => stand}/libsa/uuid_to_string.c | 0 {sys/boot => stand}/libsa/write.c | 0 {sys/boot => stand}/libsa/zalloc.c | 0 {sys/boot => stand}/libsa/zalloc_defs.h | 0 {sys/boot => stand}/libsa/zalloc_malloc.c | 0 {sys/boot => stand}/libsa/zalloc_mem.h | 0 {sys/boot => stand}/libsa/zalloc_protos.h | 0 {sys/boot => stand}/libsa32/Makefile | 0 {sys/boot => stand}/libsa32/Makefile.depend | 0 {sys/boot => stand}/loader.mk | 0 {sys/boot => stand}/man/Makefile | 0 {sys/boot => stand}/man/Makefile.depend | 0 {sys/boot => stand}/man/loader.8 | 0 {sys/boot => stand}/man/zfsloader.8 | 0 {sys/boot => stand}/mips/Makefile | 0 {sys/boot => stand}/mips/Makefile.inc | 0 {sys/boot => stand}/mips/beri/Makefile | 0 {sys/boot => stand}/mips/beri/Makefile.inc | 0 {sys/boot => stand}/mips/beri/boot2/Makefile | 0 {sys/boot => stand}/mips/beri/boot2/boot2.c | 0 .../mips/beri/boot2/flashboot.ldscript | 0 .../mips/beri/boot2/jtagboot.ldscript | 0 .../boot => stand}/mips/beri/boot2/relocate.S | 0 {sys/boot => stand}/mips/beri/boot2/start.S | 0 .../mips/beri/common/altera_jtag_uart.c | 0 {sys/boot => stand}/mips/beri/common/beri.h | 0 {sys/boot => stand}/mips/beri/common/cfi.c | 0 {sys/boot => stand}/mips/beri/common/cfi.h | 0 .../mips/beri/common/common.ldscript | 0 {sys/boot => stand}/mips/beri/common/cons.h | 0 {sys/boot => stand}/mips/beri/common/mips.h | 0 {sys/boot => stand}/mips/beri/common/sdcard.c | 0 {sys/boot => stand}/mips/beri/common/sdcard.h | 0 {sys/boot => stand}/mips/beri/loader/Makefile | 0 {sys/boot => stand}/mips/beri/loader/arch.c | 0 .../mips/beri/loader/beri_console.c | 0 .../mips/beri/loader/beri_disk_cfi.c | 0 .../mips/beri/loader/beri_disk_sdcard.c | 0 .../mips/beri/loader/devicename.c | 0 {sys/boot => stand}/mips/beri/loader/exec.c | 0 .../boot => stand}/mips/beri/loader/help.mips | 0 {sys/boot => stand}/mips/beri/loader/loader.h | 0 .../mips/beri/loader/loader.ldscript | 0 {sys/boot => stand}/mips/beri/loader/main.c | 0 .../mips/beri/loader/metadata.c | 0 {sys/boot => stand}/mips/beri/loader/start.S | 0 {sys/boot => stand}/mips/beri/loader/version | 0 {sys/boot => stand}/mips/uboot/Makefile | 0 {sys/boot => stand}/mips/uboot/conf.c | 0 {sys/boot => stand}/mips/uboot/help.uboot | 0 {sys/boot => stand}/mips/uboot/ldscript.mips | 0 {sys/boot => stand}/mips/uboot/loader.conf | 0 {sys/boot => stand}/mips/uboot/start.S | 0 {sys/boot => stand}/mips/uboot/version | 0 {sys/boot => stand}/ofw/Makefile | 0 {sys/boot => stand}/ofw/Makefile.inc | 0 {sys/boot => stand}/ofw/common/Makefile.inc | 0 {sys/boot => stand}/ofw/common/main.c | 0 {sys/boot => stand}/ofw/libofw/Makefile | 0 {sys/boot => stand}/ofw/libofw/devicename.c | 0 {sys/boot => stand}/ofw/libofw/elf_freebsd.c | 0 {sys/boot => stand}/ofw/libofw/libofw.h | 0 {sys/boot => stand}/ofw/libofw/ofw_console.c | 0 {sys/boot => stand}/ofw/libofw/ofw_copy.c | 0 {sys/boot => stand}/ofw/libofw/ofw_disk.c | 0 {sys/boot => stand}/ofw/libofw/ofw_memory.c | 0 {sys/boot => stand}/ofw/libofw/ofw_module.c | 0 {sys/boot => stand}/ofw/libofw/ofw_net.c | 0 {sys/boot => stand}/ofw/libofw/ofw_reboot.c | 0 {sys/boot => stand}/ofw/libofw/ofw_time.c | 0 {sys/boot => stand}/ofw/libofw/openfirm.c | 0 {sys/boot => stand}/ofw/libofw/openfirm.h | 0 .../ofw/libofw/ppc64_elf_freebsd.c | 0 {sys/boot => stand}/powerpc/Makefile | 0 {sys/boot => stand}/powerpc/Makefile.inc | 0 .../powerpc/boot1.chrp/Makefile | 0 .../powerpc/boot1.chrp/Makefile.hfs | 0 .../boot => stand}/powerpc/boot1.chrp/boot1.c | 0 .../powerpc/boot1.chrp/bootinfo.txt | 0 .../powerpc/boot1.chrp/generate-hfs.sh | 0 .../powerpc/boot1.chrp/hfs.tmpl.bz2.uu | 0 {sys/boot => stand}/powerpc/kboot/Makefile | 0 {sys/boot => stand}/powerpc/kboot/conf.c | 0 .../powerpc/kboot/host_syscall.S | 0 .../powerpc/kboot/host_syscall.h | 0 {sys/boot => stand}/powerpc/kboot/hostcons.c | 0 {sys/boot => stand}/powerpc/kboot/hostdisk.c | 0 {sys/boot => stand}/powerpc/kboot/kbootfdt.c | 0 .../powerpc/kboot/kerneltramp.S | 0 .../powerpc/kboot/ldscript.powerpc | 0 {sys/boot => stand}/powerpc/kboot/main.c | 0 {sys/boot => stand}/powerpc/kboot/metadata.c | 0 .../powerpc/kboot/ppc64_elf_freebsd.c | 0 {sys/boot => stand}/powerpc/kboot/version | 0 {sys/boot => stand}/powerpc/ofw/Makefile | 0 {sys/boot => stand}/powerpc/ofw/conf.c | 0 .../powerpc/ofw/ldscript.powerpc | 0 {sys/boot => stand}/powerpc/ofw/metadata.c | 0 {sys/boot => stand}/powerpc/ofw/ofwfdt.c | 0 {sys/boot => stand}/powerpc/ofw/start.c | 0 {sys/boot => stand}/powerpc/ofw/version | 0 {sys/boot => stand}/powerpc/ps3/Makefile | 0 {sys/boot => stand}/powerpc/ps3/conf.c | 0 {sys/boot => stand}/powerpc/ps3/devicename.c | 0 .../powerpc/ps3/ldscript.powerpc | 0 {sys/boot => stand}/powerpc/ps3/lv1call.S | 0 {sys/boot => stand}/powerpc/ps3/lv1call.h | 0 {sys/boot => stand}/powerpc/ps3/main.c | 0 {sys/boot => stand}/powerpc/ps3/metadata.c | 0 .../powerpc/ps3/ppc64_elf_freebsd.c | 0 {sys/boot => stand}/powerpc/ps3/ps3.h | 0 {sys/boot => stand}/powerpc/ps3/ps3bus.h | 0 {sys/boot => stand}/powerpc/ps3/ps3cdrom.c | 0 {sys/boot => stand}/powerpc/ps3/ps3cons.c | 0 {sys/boot => stand}/powerpc/ps3/ps3devdesc.h | 0 {sys/boot => stand}/powerpc/ps3/ps3disk.c | 0 {sys/boot => stand}/powerpc/ps3/ps3mmu.c | 0 {sys/boot => stand}/powerpc/ps3/ps3net.c | 0 {sys/boot => stand}/powerpc/ps3/ps3repo.c | 0 {sys/boot => stand}/powerpc/ps3/ps3repo.h | 0 {sys/boot => stand}/powerpc/ps3/ps3stor.c | 0 {sys/boot => stand}/powerpc/ps3/ps3stor.h | 0 {sys/boot => stand}/powerpc/ps3/start.S | 0 {sys/boot => stand}/powerpc/ps3/version | 0 {sys/boot => stand}/powerpc/uboot/Makefile | 0 {sys/boot => stand}/powerpc/uboot/conf.c | 0 .../powerpc/uboot/ldscript.powerpc | 0 {sys/boot => stand}/powerpc/uboot/start.S | 0 {sys/boot => stand}/powerpc/uboot/version | 0 {sys/boot => stand}/sparc64/Makefile | 0 {sys/boot => stand}/sparc64/Makefile.inc | 0 {sys/boot => stand}/sparc64/boot1/Makefile | 0 {sys/boot => stand}/sparc64/boot1/_start.s | 0 {sys/boot => stand}/sparc64/boot1/boot1.c | 0 {sys/boot => stand}/sparc64/loader/Makefile | 0 .../sparc64/loader/help.sparc64 | 0 {sys/boot => stand}/sparc64/loader/locore.S | 0 {sys/boot => stand}/sparc64/loader/main.c | 0 {sys/boot => stand}/sparc64/loader/metadata.c | 0 {sys/boot => stand}/sparc64/loader/version | 0 {sys/boot => stand}/sparc64/zfsboot/Makefile | 0 .../boot => stand}/sparc64/zfsloader/Makefile | 0 {sys/boot => stand}/uboot.mk | 0 {sys/boot => stand}/uboot/Makefile | 0 {sys/boot => stand}/uboot/Makefile.inc | 0 {sys/boot => stand}/uboot/common/main.c | 0 {sys/boot => stand}/uboot/common/metadata.c | 0 {sys/boot => stand}/uboot/fdt/Makefile | 0 {sys/boot => stand}/uboot/fdt/uboot_fdt.c | 0 {sys/boot => stand}/uboot/lib/Makefile | 0 {sys/boot => stand}/uboot/lib/api_public.h | 0 {sys/boot => stand}/uboot/lib/console.c | 0 {sys/boot => stand}/uboot/lib/copy.c | 0 {sys/boot => stand}/uboot/lib/devicename.c | 0 {sys/boot => stand}/uboot/lib/disk.c | 0 {sys/boot => stand}/uboot/lib/elf_freebsd.c | 0 {sys/boot => stand}/uboot/lib/glue.c | 0 {sys/boot => stand}/uboot/lib/glue.h | 0 {sys/boot => stand}/uboot/lib/libuboot.h | 0 {sys/boot => stand}/uboot/lib/module.c | 0 {sys/boot => stand}/uboot/lib/net.c | 0 {sys/boot => stand}/uboot/lib/reboot.c | 0 {sys/boot => stand}/uboot/lib/time.c | 0 {sys/boot => stand}/usb/Makefile | 0 {sys/boot => stand}/usb/Makefile.test | 0 {sys/boot => stand}/usb/bsd_usbloader_test.c | 0 .../boot => stand}/usb/storage/umass_common.c | 0 .../boot => stand}/usb/storage/umass_common.h | 0 .../boot => stand}/usb/storage/umass_loader.c | 0 {sys/boot => stand}/usb/tools/Makefile | 0 {sys/boot => stand}/usb/tools/sysinit.c | 0 {sys/boot => stand}/usb/usb_busdma_loader.c | 0 {sys/boot => stand}/usb/usbcore.mk | 0 {sys/boot => stand}/userboot/Makefile | 0 {sys/boot => stand}/userboot/Makefile.inc | 0 {sys/boot => stand}/userboot/test/Makefile | 0 .../userboot/test/Makefile.depend | 0 {sys/boot => stand}/userboot/test/test.c | 0 {sys/boot => stand}/userboot/userboot.h | 0 .../boot => stand}/userboot/userboot/Makefile | 0 .../userboot/userboot/Makefile.depend | 6 +- .../userboot/userboot/autoload.c | 0 .../userboot/userboot/biossmap.c | 0 .../userboot/userboot/bootinfo.c | 0 .../userboot/userboot/bootinfo32.c | 0 .../userboot/userboot/bootinfo64.c | 0 {sys/boot => stand}/userboot/userboot/conf.c | 0 {sys/boot => stand}/userboot/userboot/copy.c | 0 .../userboot/userboot/devicename.c | 0 .../userboot/userboot/elf32_freebsd.c | 0 .../userboot/userboot/elf64_freebsd.c | 0 {sys/boot => stand}/userboot/userboot/host.c | 0 .../userboot/userboot/libuserboot.h | 0 {sys/boot => stand}/userboot/userboot/main.c | 0 .../userboot/userboot/userboot_cons.c | 0 .../userboot/userboot/userboot_disk.c | 0 {sys/boot => stand}/userboot/userboot/version | 0 {sys/boot => stand}/zfs/Makefile | 0 {sys/boot => stand}/zfs/Makefile.depend | 0 {sys/boot => stand}/zfs/devicename_stubs.c | 0 {sys/boot => stand}/zfs/libzfs.h | 0 {sys/boot => stand}/zfs/zfs.c | 0 {sys/boot => stand}/zfs/zfsimpl.c | 0 {sys/boot => stand}/zfs32/Makefile | 0 {sys/boot => stand}/zfs32/Makefile.depend | 0 sys/Makefile | 7 +- sys/boot/i386/loader/Makefile.depend | 20 ------ sys/boot/i386/zfsloader/Makefile.depend | 21 ------ sys/contrib/dev/acpica/acpica_prep.sh | 2 +- targets/pseudo/userland/lib/Makefile.depend | 2 +- targets/pseudo/userland/misc/Makefile.depend | 66 +++++++++--------- targets/pseudo/userland/share/Makefile.depend | 2 +- tools/boot/universe.sh | 6 +- tools/tools/bootparttest/Makefile | 4 +- tools/tools/zfsboottest/Makefile | 4 +- usr.sbin/bhyveload/Makefile | 2 +- usr.sbin/efivar/Makefile | 2 +- 706 files changed, 135 insertions(+), 137 deletions(-) rename {sys/boot => stand}/Makefile (100%) rename {sys/boot => stand}/Makefile.amd64 (100%) rename {sys/boot => stand}/Makefile.arm (100%) rename {sys/boot => stand}/Makefile.arm64 (100%) rename {sys/boot => stand}/Makefile.i386 (100%) rename {sys/boot => stand}/Makefile.inc (100%) rename {sys/boot => stand}/Makefile.mips (100%) rename {sys/boot => stand}/Makefile.powerpc (100%) rename {sys/boot => stand}/Makefile.sparc64 (100%) rename {sys/boot => stand}/arm/Makefile (100%) rename {sys/boot => stand}/arm/Makefile.inc (100%) rename {sys/boot => stand}/arm/loader/loader.conf (100%) rename {sys/boot => stand}/arm/uboot/Makefile (100%) rename {sys/boot => stand}/arm/uboot/conf.c (100%) rename {sys/boot => stand}/arm/uboot/help.uboot (100%) rename {sys/boot => stand}/arm/uboot/ldscript.arm (100%) rename {sys/boot => stand}/arm/uboot/start.S (100%) rename {sys/boot => stand}/arm/uboot/version (100%) rename {sys/boot => stand}/arm64/Makefile (100%) rename {sys/boot => stand}/arm64/libarm64/cache.c (100%) rename {sys/boot => stand}/arm64/libarm64/cache.h (100%) rename {sys/boot => stand}/common/Makefile.depend (100%) rename {sys/boot => stand}/common/bcache.c (100%) rename {sys/boot => stand}/common/boot.c (100%) rename {sys/boot => stand}/common/bootstrap.h (100%) rename {sys/boot => stand}/common/commands.c (100%) rename {sys/boot => stand}/common/console.c (100%) rename {sys/boot => stand}/common/dev_net.c (100%) rename {sys/boot => stand}/common/dev_net.h (100%) rename {sys/boot => stand}/common/devopen.c (100%) rename {sys/boot => stand}/common/disk.c (100%) rename {sys/boot => stand}/common/disk.h (100%) rename {sys/boot => stand}/common/help.common (100%) rename {sys/boot => stand}/common/install.c (100%) rename {sys/boot => stand}/common/interp.c (100%) rename {sys/boot => stand}/common/interp_backslash.c (100%) rename {sys/boot => stand}/common/interp_forth.c (100%) rename {sys/boot => stand}/common/interp_parse.c (100%) rename {sys/boot => stand}/common/isapnp.c (100%) rename {sys/boot => stand}/common/isapnp.h (100%) rename {sys/boot => stand}/common/load_elf.c (100%) rename {sys/boot => stand}/common/load_elf32.c (100%) rename {sys/boot => stand}/common/load_elf32_obj.c (100%) rename {sys/boot => stand}/common/load_elf64.c (100%) rename {sys/boot => stand}/common/load_elf64_obj.c (100%) rename {sys/boot => stand}/common/load_elf_obj.c (100%) rename {sys/boot => stand}/common/ls.c (100%) rename {sys/boot => stand}/common/md.c (100%) rename {sys/boot => stand}/common/merge_help.awk (100%) rename {sys/boot => stand}/common/misc.c (100%) rename {sys/boot => stand}/common/module.c (100%) rename {sys/boot => stand}/common/newvers.sh (100%) rename {sys/boot => stand}/common/part.c (100%) rename {sys/boot => stand}/common/part.h (100%) rename {sys/boot => stand}/common/paths.h (100%) rename {sys/boot => stand}/common/pnp.c (100%) rename {sys/boot => stand}/common/rbx.h (100%) rename {sys/boot => stand}/common/reloc_elf.c (100%) rename {sys/boot => stand}/common/reloc_elf32.c (100%) rename {sys/boot => stand}/common/reloc_elf64.c (100%) rename {sys/boot => stand}/common/self_reloc.c (100%) rename {sys/boot => stand}/defs.mk (98%) rename {sys/boot => stand}/efi/Makefile (100%) rename {sys/boot => stand}/efi/Makefile.inc (100%) rename {sys/boot => stand}/efi/boot1/Makefile (100%) rename {sys/boot => stand}/efi/boot1/Makefile.depend (79%) rename {sys/boot => stand}/efi/boot1/Makefile.fat (100%) rename {sys/boot => stand}/efi/boot1/boot1.c (100%) rename {sys/boot => stand}/efi/boot1/boot_module.h (100%) rename {sys/boot => stand}/efi/boot1/fat-amd64.tmpl.xz (100%) rename {sys/boot => stand}/efi/boot1/fat-arm.tmpl.xz (100%) rename {sys/boot => stand}/efi/boot1/fat-arm64.tmpl.xz (100%) rename {sys/boot => stand}/efi/boot1/fat-i386.tmpl.xz (100%) rename {sys/boot => stand}/efi/boot1/generate-fat.sh (100%) rename {sys/boot => stand}/efi/boot1/ufs_module.c (100%) rename {sys/boot => stand}/efi/boot1/zfs_module.c (100%) rename {sys/boot => stand}/efi/fdt/Makefile (100%) rename {sys/boot => stand}/efi/fdt/Makefile.depend (100%) rename {sys/boot => stand}/efi/fdt/efi_fdt.c (100%) rename {sys/boot => stand}/efi/include/README (100%) rename {sys/boot => stand}/efi/include/amd64/efibind.h (100%) rename {sys/boot => stand}/efi/include/amd64/pe.h (100%) rename {sys/boot => stand}/efi/include/arm/efibind.h (100%) rename {sys/boot => stand}/efi/include/arm64/efibind.h (100%) rename {sys/boot => stand}/efi/include/efi.h (100%) rename {sys/boot => stand}/efi/include/efi_driver_utils.h (100%) rename {sys/boot => stand}/efi/include/efi_drivers.h (100%) rename {sys/boot => stand}/efi/include/efi_nii.h (100%) rename {sys/boot => stand}/efi/include/efiapi.h (100%) rename {sys/boot => stand}/efi/include/efichar.h (100%) rename {sys/boot => stand}/efi/include/eficon.h (100%) rename {sys/boot => stand}/efi/include/eficonsctl.h (100%) rename {sys/boot => stand}/efi/include/efidebug.h (100%) rename {sys/boot => stand}/efi/include/efidef.h (100%) rename {sys/boot => stand}/efi/include/efidevp.h (100%) rename {sys/boot => stand}/efi/include/efierr.h (100%) rename {sys/boot => stand}/efi/include/efifpswa.h (100%) rename {sys/boot => stand}/efi/include/efifs.h (100%) rename {sys/boot => stand}/efi/include/efigop.h (100%) rename {sys/boot => stand}/efi/include/efilib.h (100%) rename {sys/boot => stand}/efi/include/efinet.h (100%) rename {sys/boot => stand}/efi/include/efipart.h (100%) rename {sys/boot => stand}/efi/include/efipciio.h (100%) rename {sys/boot => stand}/efi/include/efiprot.h (100%) rename {sys/boot => stand}/efi/include/efipxebc.h (100%) rename {sys/boot => stand}/efi/include/efiser.h (100%) rename {sys/boot => stand}/efi/include/efistdarg.h (100%) rename {sys/boot => stand}/efi/include/efiuga.h (100%) rename {sys/boot => stand}/efi/include/efizfs.h (100%) rename {sys/boot => stand}/efi/include/i386/efibind.h (100%) rename {sys/boot => stand}/efi/include/i386/pe.h (100%) rename {sys/boot => stand}/efi/libefi/Makefile (100%) rename {sys/boot => stand}/efi/libefi/Makefile.depend (100%) rename {sys/boot => stand}/efi/libefi/delay.c (100%) rename {sys/boot => stand}/efi/libefi/devicename.c (100%) rename {sys/boot => stand}/efi/libefi/devpath.c (100%) rename {sys/boot => stand}/efi/libefi/efi_console.c (100%) rename {sys/boot => stand}/efi/libefi/efi_driver_utils.c (100%) rename {sys/boot => stand}/efi/libefi/efichar.c (100%) rename {sys/boot => stand}/efi/libefi/efinet.c (100%) rename {sys/boot => stand}/efi/libefi/efipart.c (100%) rename {sys/boot => stand}/efi/libefi/efizfs.c (100%) rename {sys/boot => stand}/efi/libefi/env.c (100%) rename {sys/boot => stand}/efi/libefi/errno.c (100%) rename {sys/boot => stand}/efi/libefi/handles.c (100%) rename {sys/boot => stand}/efi/libefi/libefi.c (100%) rename {sys/boot => stand}/efi/libefi/time.c (100%) rename {sys/boot => stand}/efi/libefi/time_event.c (100%) rename {sys/boot => stand}/efi/libefi/wchar.c (100%) rename {sys/boot => stand}/efi/loader/Makefile (100%) rename {sys/boot => stand}/efi/loader/Makefile.depend (73%) rename {sys/boot => stand}/efi/loader/arch/amd64/Makefile.inc (100%) rename {sys/boot => stand}/efi/loader/arch/amd64/amd64_tramp.S (100%) rename {sys/boot => stand}/efi/loader/arch/amd64/elf64_freebsd.c (100%) rename {sys/boot => stand}/efi/loader/arch/amd64/exc.S (100%) rename {sys/boot => stand}/efi/loader/arch/amd64/ldscript.amd64 (100%) rename {sys/boot => stand}/efi/loader/arch/amd64/start.S (100%) rename {sys/boot => stand}/efi/loader/arch/amd64/trap.c (100%) rename {sys/boot => stand}/efi/loader/arch/arm/Makefile.inc (100%) rename {sys/boot => stand}/efi/loader/arch/arm/exec.c (100%) rename {sys/boot => stand}/efi/loader/arch/arm/ldscript.arm (100%) rename {sys/boot => stand}/efi/loader/arch/arm/start.S (100%) rename {sys/boot => stand}/efi/loader/arch/arm64/Makefile.inc (100%) rename {sys/boot => stand}/efi/loader/arch/arm64/exec.c (100%) rename {sys/boot => stand}/efi/loader/arch/arm64/ldscript.arm64 (100%) rename {sys/boot => stand}/efi/loader/arch/arm64/start.S (100%) rename {sys/boot => stand}/efi/loader/arch/i386/Makefile.inc (100%) rename {sys/boot => stand}/efi/loader/arch/i386/bootinfo.c (100%) rename {sys/boot => stand}/efi/loader/arch/i386/efimd.c (100%) rename {sys/boot => stand}/efi/loader/arch/i386/elf32_freebsd.c (100%) rename {sys/boot => stand}/efi/loader/arch/i386/exec.c (100%) rename {sys/boot => stand}/efi/loader/arch/i386/i386_copy.c (100%) rename {sys/boot => stand}/efi/loader/arch/i386/ldscript.i386 (100%) rename {sys/boot => stand}/efi/loader/arch/i386/start.S (100%) rename {sys/boot => stand}/efi/loader/autoload.c (100%) rename {sys/boot => stand}/efi/loader/bootinfo.c (100%) rename {sys/boot => stand}/efi/loader/conf.c (100%) rename {sys/boot => stand}/efi/loader/copy.c (100%) rename {sys/boot => stand}/efi/loader/efi_main.c (100%) rename {sys/boot => stand}/efi/loader/framebuffer.c (100%) rename {sys/boot => stand}/efi/loader/framebuffer.h (100%) rename {sys/boot => stand}/efi/loader/loader_efi.h (100%) rename {sys/boot => stand}/efi/loader/main.c (100%) rename {sys/boot => stand}/efi/loader/version (100%) rename {sys/boot => stand}/fdt.mk (100%) rename {sys/boot => stand}/fdt/Makefile (100%) rename {sys/boot => stand}/fdt/Makefile.depend (100%) rename {sys/boot => stand}/fdt/fdt_loader_cmd.c (100%) rename {sys/boot => stand}/fdt/fdt_overlay.c (100%) rename {sys/boot => stand}/fdt/fdt_overlay.h (100%) rename {sys/boot => stand}/fdt/fdt_platform.h (100%) rename {sys/boot => stand}/fdt/help.fdt (100%) rename {sys/boot => stand}/ficl.mk (100%) rename {sys/boot => stand}/ficl/Makefile (100%) rename {sys/boot => stand}/ficl/Makefile.depend (100%) rename {sys/boot => stand}/ficl/aarch64/sysdep.c (100%) rename {sys/boot => stand}/ficl/aarch64/sysdep.h (100%) rename {sys/boot => stand}/ficl/amd64/sysdep.c (100%) rename {sys/boot => stand}/ficl/amd64/sysdep.h (100%) rename {sys/boot => stand}/ficl/arm/sysdep.c (100%) rename {sys/boot => stand}/ficl/arm/sysdep.h (100%) rename {sys/boot => stand}/ficl/dict.c (100%) rename {sys/boot => stand}/ficl/ficl.c (100%) rename {sys/boot => stand}/ficl/ficl.h (100%) rename {sys/boot => stand}/ficl/fileaccess.c (100%) rename {sys/boot => stand}/ficl/float.c (100%) rename {sys/boot => stand}/ficl/i386/sysdep.c (100%) rename {sys/boot => stand}/ficl/i386/sysdep.h (100%) rename {sys/boot => stand}/ficl/loader.c (100%) rename {sys/boot => stand}/ficl/math64.c (100%) rename {sys/boot => stand}/ficl/math64.h (100%) rename {sys/boot => stand}/ficl/mips/sysdep.c (100%) rename {sys/boot => stand}/ficl/mips/sysdep.h (100%) rename {sys/boot => stand}/ficl/mips64/sysdep.c (100%) rename {sys/boot => stand}/ficl/mips64/sysdep.h (100%) rename {sys/boot => stand}/ficl/powerpc/sysdep.c (100%) rename {sys/boot => stand}/ficl/powerpc/sysdep.h (100%) rename {sys/boot => stand}/ficl/prefix.c (100%) rename {sys/boot => stand}/ficl/riscv/sysdep.c (100%) rename {sys/boot => stand}/ficl/riscv/sysdep.h (100%) rename {sys/boot => stand}/ficl/search.c (100%) rename {sys/boot => stand}/ficl/softwords/classes.fr (100%) rename {sys/boot => stand}/ficl/softwords/ficlclass.fr (100%) rename {sys/boot => stand}/ficl/softwords/ficllocal.fr (100%) rename {sys/boot => stand}/ficl/softwords/fileaccess.fr (100%) rename {sys/boot => stand}/ficl/softwords/forml.fr (100%) rename {sys/boot => stand}/ficl/softwords/freebsd.fr (100%) rename {sys/boot => stand}/ficl/softwords/ifbrack.fr (100%) rename {sys/boot => stand}/ficl/softwords/jhlocal.fr (100%) rename {sys/boot => stand}/ficl/softwords/marker.fr (100%) rename {sys/boot => stand}/ficl/softwords/oo.fr (100%) rename {sys/boot => stand}/ficl/softwords/prefix.fr (100%) rename {sys/boot => stand}/ficl/softwords/softcore.awk (100%) rename {sys/boot => stand}/ficl/softwords/softcore.fr (100%) rename {sys/boot => stand}/ficl/softwords/string.fr (100%) rename {sys/boot => stand}/ficl/sparc64/sysdep.c (100%) rename {sys/boot => stand}/ficl/sparc64/sysdep.h (100%) rename {sys/boot => stand}/ficl/stack.c (100%) rename {sys/boot => stand}/ficl/testmain.c (100%) rename {sys/boot => stand}/ficl/tools.c (100%) rename {sys/boot => stand}/ficl/unix.c (100%) rename {sys/boot => stand}/ficl/vm.c (100%) rename {sys/boot => stand}/ficl/words.c (100%) rename {sys/boot => stand}/ficl32/Makefile (100%) rename {sys/boot => stand}/ficl32/Makefile.depend (100%) rename {sys/boot => stand}/forth/Makefile (100%) rename {sys/boot => stand}/forth/Makefile.depend (100%) rename {sys/boot => stand}/forth/beastie.4th (100%) rename {sys/boot => stand}/forth/beastie.4th.8 (100%) rename {sys/boot => stand}/forth/brand-fbsd.4th (100%) rename {sys/boot => stand}/forth/brand.4th (100%) rename {sys/boot => stand}/forth/brand.4th.8 (100%) rename {sys/boot => stand}/forth/check-password.4th (100%) rename {sys/boot => stand}/forth/check-password.4th.8 (100%) rename {sys/boot => stand}/forth/color.4th (100%) rename {sys/boot => stand}/forth/color.4th.8 (100%) rename {sys/boot => stand}/forth/delay.4th (100%) rename {sys/boot => stand}/forth/delay.4th.8 (100%) rename {sys/boot => stand}/forth/efi.4th (100%) rename {sys/boot => stand}/forth/frames.4th (100%) rename {sys/boot => stand}/forth/loader.4th (100%) rename {sys/boot => stand}/forth/loader.4th.8 (100%) rename {sys/boot => stand}/forth/loader.conf (100%) rename {sys/boot => stand}/forth/loader.conf.5 (100%) rename {sys/boot => stand}/forth/loader.rc (100%) rename {sys/boot => stand}/forth/logo-beastie.4th (100%) rename {sys/boot => stand}/forth/logo-beastiebw.4th (100%) rename {sys/boot => stand}/forth/logo-fbsdbw.4th (100%) rename {sys/boot => stand}/forth/logo-orb.4th (100%) rename {sys/boot => stand}/forth/logo-orbbw.4th (100%) rename {sys/boot => stand}/forth/menu-commands.4th (100%) rename {sys/boot => stand}/forth/menu.4th (100%) rename {sys/boot => stand}/forth/menu.4th.8 (100%) rename {sys/boot => stand}/forth/menu.rc (100%) rename {sys/boot => stand}/forth/menusets.4th (100%) rename {sys/boot => stand}/forth/menusets.4th.8 (100%) rename {sys/boot => stand}/forth/pcibios.4th (100%) rename {sys/boot => stand}/forth/pnp.4th (98%) rename {sys/boot => stand}/forth/screen.4th (100%) rename {sys/boot => stand}/forth/shortcuts.4th (100%) rename {sys/boot => stand}/forth/support.4th (99%) rename {sys/boot => stand}/forth/version.4th (100%) rename {sys/boot => stand}/forth/version.4th.8 (100%) rename {sys/boot => stand}/geli/Makefile (100%) rename {sys/boot => stand}/geli/Makefile.depend (100%) rename {sys/boot => stand}/geli/geliboot.c (100%) rename {sys/boot => stand}/geli/geliboot.h (100%) rename {sys/boot => stand}/geli/geliboot_crypto.c (100%) rename {sys/boot => stand}/geli/geliboot_internal.h (100%) rename {sys/boot => stand}/geli/pwgets.c (100%) rename {sys/boot => stand}/i386/Makefile (100%) rename {sys/boot => stand}/i386/Makefile.inc (95%) rename {sys/boot => stand}/i386/boot.ldscript (100%) rename {sys/boot => stand}/i386/boot0/Makefile (100%) rename {sys/boot => stand}/i386/boot0/Makefile.depend (100%) rename {sys/boot => stand}/i386/boot0/boot0.S (100%) rename {sys/boot => stand}/i386/boot0sio/Makefile (100%) rename {sys/boot => stand}/i386/boot0sio/Makefile.depend (100%) rename {sys/boot => stand}/i386/boot2/Makefile (100%) rename {sys/boot => stand}/i386/boot2/Makefile.depend (78%) rename {sys/boot => stand}/i386/boot2/boot1.S (100%) rename {sys/boot => stand}/i386/boot2/boot2.c (100%) rename {sys/boot => stand}/i386/boot2/lib.h (100%) rename {sys/boot => stand}/i386/boot2/sio.S (100%) rename {sys/boot => stand}/i386/btx/Makefile (100%) rename {sys/boot => stand}/i386/btx/Makefile.inc (100%) rename {sys/boot => stand}/i386/btx/btx/Makefile (100%) rename {sys/boot => stand}/i386/btx/btx/Makefile.depend (100%) rename {sys/boot => stand}/i386/btx/btx/btx.S (100%) rename {sys/boot => stand}/i386/btx/btxldr/Makefile (100%) rename {sys/boot => stand}/i386/btx/btxldr/Makefile.depend (100%) rename {sys/boot => stand}/i386/btx/btxldr/btxldr.S (100%) rename {sys/boot => stand}/i386/btx/lib/Makefile (100%) rename {sys/boot => stand}/i386/btx/lib/Makefile.depend (100%) rename {sys/boot => stand}/i386/btx/lib/btxcsu.S (100%) rename {sys/boot => stand}/i386/btx/lib/btxsys.s (100%) rename {sys/boot => stand}/i386/btx/lib/btxv86.h (100%) rename {sys/boot => stand}/i386/btx/lib/btxv86.s (100%) rename {sys/boot => stand}/i386/cdboot/Makefile (100%) rename {sys/boot => stand}/i386/cdboot/Makefile.depend (100%) rename {sys/boot => stand}/i386/cdboot/cdboot.S (100%) rename {sys/boot => stand}/i386/common/bootargs.h (100%) rename {sys/boot => stand}/i386/common/cons.c (100%) rename {sys/boot => stand}/i386/common/cons.h (100%) rename {sys/boot => stand}/i386/common/drv.c (100%) rename {sys/boot => stand}/i386/common/drv.h (100%) rename {sys/boot => stand}/i386/common/edd.h (100%) rename {sys/boot => stand}/i386/gptboot/Makefile (100%) rename {sys/boot => stand}/i386/gptboot/Makefile.depend (71%) rename {sys/boot => stand}/i386/gptboot/gptboot.8 (100%) rename {sys/boot => stand}/i386/gptboot/gptboot.c (100%) rename {sys/boot => stand}/i386/gptboot/gptldr.S (100%) rename {sys/boot => stand}/i386/gptzfsboot/Makefile (100%) rename {sys/boot => stand}/i386/gptzfsboot/Makefile.depend (67%) rename {sys/boot => stand}/i386/gptzfsboot/gptzfsboot.8 (100%) rename {sys/boot => stand}/i386/kgzldr/Makefile (100%) rename {sys/boot => stand}/i386/kgzldr/Makefile.depend (100%) rename {sys/boot => stand}/i386/kgzldr/boot.c (100%) rename {sys/boot => stand}/i386/kgzldr/crt.s (100%) rename {sys/boot => stand}/i386/kgzldr/kgzldr.h (100%) rename {sys/boot => stand}/i386/kgzldr/lib.c (100%) rename {sys/boot => stand}/i386/kgzldr/sio.s (100%) rename {sys/boot => stand}/i386/kgzldr/start.s (100%) rename {sys/boot => stand}/i386/libfirewire/Makefile (100%) rename {sys/boot => stand}/i386/libfirewire/Makefile.depend (100%) rename {sys/boot => stand}/i386/libfirewire/dconsole.c (100%) rename {sys/boot => stand}/i386/libfirewire/firewire.c (100%) rename {sys/boot => stand}/i386/libfirewire/fwohci.c (100%) rename {sys/boot => stand}/i386/libfirewire/fwohci.h (100%) rename {sys/boot => stand}/i386/libfirewire/fwohcireg.h (100%) rename {sys/boot => stand}/i386/libi386/Makefile (100%) rename {sys/boot => stand}/i386/libi386/Makefile.depend (100%) rename {sys/boot => stand}/i386/libi386/amd64_tramp.S (100%) rename {sys/boot => stand}/i386/libi386/biosacpi.c (100%) rename {sys/boot => stand}/i386/libi386/bioscd.c (100%) rename {sys/boot => stand}/i386/libi386/biosdisk.c (100%) rename {sys/boot => stand}/i386/libi386/biosmem.c (100%) rename {sys/boot => stand}/i386/libi386/biospci.c (100%) rename {sys/boot => stand}/i386/libi386/biospnp.c (100%) rename {sys/boot => stand}/i386/libi386/biossmap.c (100%) rename {sys/boot => stand}/i386/libi386/bootinfo.c (100%) rename {sys/boot => stand}/i386/libi386/bootinfo32.c (100%) rename {sys/boot => stand}/i386/libi386/bootinfo64.c (100%) rename {sys/boot => stand}/i386/libi386/comconsole.c (100%) rename {sys/boot => stand}/i386/libi386/devicename.c (100%) rename {sys/boot => stand}/i386/libi386/elf32_freebsd.c (100%) rename {sys/boot => stand}/i386/libi386/elf64_freebsd.c (100%) rename {sys/boot => stand}/i386/libi386/i386_copy.c (100%) rename {sys/boot => stand}/i386/libi386/i386_module.c (100%) rename {sys/boot => stand}/i386/libi386/libi386.h (100%) rename {sys/boot => stand}/i386/libi386/multiboot.c (100%) rename {sys/boot => stand}/i386/libi386/multiboot.h (100%) rename {sys/boot => stand}/i386/libi386/multiboot_tramp.S (100%) rename {sys/boot => stand}/i386/libi386/nullconsole.c (100%) rename {sys/boot => stand}/i386/libi386/pread.c (100%) rename {sys/boot => stand}/i386/libi386/pxe.c (100%) rename {sys/boot => stand}/i386/libi386/pxe.h (100%) rename {sys/boot => stand}/i386/libi386/pxetramp.s (100%) rename {sys/boot => stand}/i386/libi386/relocater_tramp.S (100%) rename {sys/boot => stand}/i386/libi386/smbios.c (100%) rename {sys/boot => stand}/i386/libi386/smbios.h (100%) rename {sys/boot => stand}/i386/libi386/spinconsole.c (100%) rename {sys/boot => stand}/i386/libi386/time.c (100%) rename {sys/boot => stand}/i386/libi386/vidconsole.c (100%) rename {sys/boot => stand}/i386/loader/Makefile (100%) create mode 100644 stand/i386/loader/Makefile.depend rename {sys/boot => stand}/i386/loader/chain.c (100%) rename {sys/boot => stand}/i386/loader/conf.c (100%) rename {sys/boot => stand}/i386/loader/help.i386 (100%) rename {sys/boot => stand}/i386/loader/loader.rc (100%) rename {sys/boot => stand}/i386/loader/main.c (100%) rename {sys/boot => stand}/i386/loader/version (100%) rename {sys/boot => stand}/i386/mbr/Makefile (100%) rename {sys/boot => stand}/i386/mbr/Makefile.depend (100%) rename {sys/boot => stand}/i386/mbr/mbr.s (100%) rename {sys/boot => stand}/i386/pmbr/Makefile (100%) rename {sys/boot => stand}/i386/pmbr/Makefile.depend (100%) rename {sys/boot => stand}/i386/pmbr/pmbr.s (100%) rename {sys/boot => stand}/i386/pxeldr/Makefile (100%) rename {sys/boot => stand}/i386/pxeldr/Makefile.depend (70%) rename {sys/boot => stand}/i386/pxeldr/pxeboot.8 (100%) rename {sys/boot => stand}/i386/pxeldr/pxeldr.S (100%) rename {sys/boot => stand}/i386/zfsboot/Makefile (100%) rename {sys/boot => stand}/i386/zfsboot/Makefile.depend (71%) rename {sys/boot => stand}/i386/zfsboot/zfsboot.8 (100%) rename {sys/boot => stand}/i386/zfsboot/zfsboot.c (100%) rename {sys/boot => stand}/i386/zfsboot/zfsldr.S (100%) rename {sys/boot => stand}/i386/zfsloader/Makefile (100%) create mode 100644 stand/i386/zfsloader/Makefile.depend rename {sys/boot => stand}/kshim/bsd_busspace.c (100%) rename {sys/boot => stand}/kshim/bsd_global.h (100%) rename {sys/boot => stand}/kshim/bsd_kernel.c (100%) rename {sys/boot => stand}/kshim/bsd_kernel.h (100%) rename {sys/boot => stand}/kshim/kshim.mk (100%) rename {sys/boot => stand}/kshim/sysinit.h (100%) rename {sys/boot => stand}/libsa/Makefile (100%) rename {sys/boot => stand}/libsa/Makefile.depend (100%) rename {sys/boot => stand}/libsa/__main.c (100%) rename {sys/boot => stand}/libsa/amd64/_setjmp.S (100%) rename {sys/boot => stand}/libsa/arp.c (100%) rename {sys/boot => stand}/libsa/assert.c (100%) rename {sys/boot => stand}/libsa/bcd.c (100%) rename {sys/boot => stand}/libsa/bootp.c (100%) rename {sys/boot => stand}/libsa/bootp.h (100%) rename {sys/boot => stand}/libsa/bootparam.c (100%) rename {sys/boot => stand}/libsa/bootparam.h (100%) rename {sys/boot => stand}/libsa/bzipfs.c (100%) rename {sys/boot => stand}/libsa/cd9660.c (100%) rename {sys/boot => stand}/libsa/close.c (100%) rename {sys/boot => stand}/libsa/closeall.c (100%) rename {sys/boot => stand}/libsa/crc32.c (100%) rename {sys/boot => stand}/libsa/crc32.h (100%) rename {sys/boot => stand}/libsa/dev.c (100%) rename {sys/boot => stand}/libsa/dosfs.c (100%) rename {sys/boot => stand}/libsa/dosfs.h (100%) rename {sys/boot => stand}/libsa/environment.c (100%) rename {sys/boot => stand}/libsa/ether.c (100%) rename {sys/boot => stand}/libsa/ext2fs.c (100%) rename {sys/boot => stand}/libsa/fstat.c (100%) rename {sys/boot => stand}/libsa/getopt.c (100%) rename {sys/boot => stand}/libsa/gets.c (100%) rename {sys/boot => stand}/libsa/globals.c (100%) rename {sys/boot => stand}/libsa/gpt.c (100%) rename {sys/boot => stand}/libsa/gpt.h (100%) rename {sys/boot => stand}/libsa/gzipfs.c (100%) rename {sys/boot => stand}/libsa/i386/_setjmp.S (100%) rename {sys/boot => stand}/libsa/in_cksum.c (100%) rename {sys/boot => stand}/libsa/inet_ntoa.c (100%) rename {sys/boot => stand}/libsa/ioctl.c (100%) rename {sys/boot => stand}/libsa/iodesc.h (100%) rename {sys/boot => stand}/libsa/ip.c (100%) rename {sys/boot => stand}/libsa/libstand.3 (100%) rename {sys/boot => stand}/libsa/lseek.c (100%) rename {sys/boot => stand}/libsa/mips/_setjmp.S (100%) rename {sys/boot => stand}/libsa/nandfs.c (100%) rename {sys/boot => stand}/libsa/net.c (100%) rename {sys/boot => stand}/libsa/net.h (100%) rename {sys/boot => stand}/libsa/netif.c (100%) rename {sys/boot => stand}/libsa/netif.h (100%) rename {sys/boot => stand}/libsa/nfs.c (100%) rename {sys/boot => stand}/libsa/nfsv2.h (100%) rename {sys/boot => stand}/libsa/nullfs.c (100%) rename {sys/boot => stand}/libsa/open.c (100%) rename {sys/boot => stand}/libsa/pager.c (100%) rename {sys/boot => stand}/libsa/panic.c (100%) rename {sys/boot => stand}/libsa/pkgfs.c (100%) rename {sys/boot => stand}/libsa/powerpc/_setjmp.S (100%) rename {sys/boot => stand}/libsa/powerpc/syncicache.c (100%) rename {sys/boot => stand}/libsa/printf.c (100%) rename {sys/boot => stand}/libsa/qdivrem.c (100%) rename {sys/boot => stand}/libsa/quad.h (100%) rename {sys/boot => stand}/libsa/random.c (100%) rename {sys/boot => stand}/libsa/rarp.c (100%) rename {sys/boot => stand}/libsa/read.c (100%) rename {sys/boot => stand}/libsa/readdir.c (100%) rename {sys/boot => stand}/libsa/rpc.c (100%) rename {sys/boot => stand}/libsa/rpc.h (100%) rename {sys/boot => stand}/libsa/rpcv2.h (100%) rename {sys/boot => stand}/libsa/saioctl.h (100%) rename {sys/boot => stand}/libsa/sbrk.c (100%) rename {sys/boot => stand}/libsa/sparc64/_setjmp.S (100%) rename {sys/boot => stand}/libsa/splitfs.c (100%) rename {sys/boot => stand}/libsa/stand.h (100%) rename {sys/boot => stand}/libsa/stat.c (100%) rename {sys/boot => stand}/libsa/strcasecmp.c (100%) rename {sys/boot => stand}/libsa/strdup.c (100%) rename {sys/boot => stand}/libsa/strerror.c (100%) rename {sys/boot => stand}/libsa/strtol.c (100%) rename {sys/boot => stand}/libsa/strtoul.c (100%) rename {sys/boot => stand}/libsa/tftp.c (100%) rename {sys/boot => stand}/libsa/tftp.h (100%) rename {sys/boot => stand}/libsa/twiddle.c (100%) rename {sys/boot => stand}/libsa/udp.c (100%) rename {sys/boot => stand}/libsa/ufs.c (100%) rename {sys/boot => stand}/libsa/ufsread.c (100%) rename {sys/boot => stand}/libsa/util.c (100%) rename {sys/boot => stand}/libsa/util.h (100%) rename {sys/boot => stand}/libsa/uuid_from_string.c (100%) rename {sys/boot => stand}/libsa/uuid_to_string.c (100%) rename {sys/boot => stand}/libsa/write.c (100%) rename {sys/boot => stand}/libsa/zalloc.c (100%) rename {sys/boot => stand}/libsa/zalloc_defs.h (100%) rename {sys/boot => stand}/libsa/zalloc_malloc.c (100%) rename {sys/boot => stand}/libsa/zalloc_mem.h (100%) rename {sys/boot => stand}/libsa/zalloc_protos.h (100%) rename {sys/boot => stand}/libsa32/Makefile (100%) rename {sys/boot => stand}/libsa32/Makefile.depend (100%) rename {sys/boot => stand}/loader.mk (100%) rename {sys/boot => stand}/man/Makefile (100%) rename {sys/boot => stand}/man/Makefile.depend (100%) rename {sys/boot => stand}/man/loader.8 (100%) rename {sys/boot => stand}/man/zfsloader.8 (100%) rename {sys/boot => stand}/mips/Makefile (100%) rename {sys/boot => stand}/mips/Makefile.inc (100%) rename {sys/boot => stand}/mips/beri/Makefile (100%) rename {sys/boot => stand}/mips/beri/Makefile.inc (100%) rename {sys/boot => stand}/mips/beri/boot2/Makefile (100%) rename {sys/boot => stand}/mips/beri/boot2/boot2.c (100%) rename {sys/boot => stand}/mips/beri/boot2/flashboot.ldscript (100%) rename {sys/boot => stand}/mips/beri/boot2/jtagboot.ldscript (100%) rename {sys/boot => stand}/mips/beri/boot2/relocate.S (100%) rename {sys/boot => stand}/mips/beri/boot2/start.S (100%) rename {sys/boot => stand}/mips/beri/common/altera_jtag_uart.c (100%) rename {sys/boot => stand}/mips/beri/common/beri.h (100%) rename {sys/boot => stand}/mips/beri/common/cfi.c (100%) rename {sys/boot => stand}/mips/beri/common/cfi.h (100%) rename {sys/boot => stand}/mips/beri/common/common.ldscript (100%) rename {sys/boot => stand}/mips/beri/common/cons.h (100%) rename {sys/boot => stand}/mips/beri/common/mips.h (100%) rename {sys/boot => stand}/mips/beri/common/sdcard.c (100%) rename {sys/boot => stand}/mips/beri/common/sdcard.h (100%) rename {sys/boot => stand}/mips/beri/loader/Makefile (100%) rename {sys/boot => stand}/mips/beri/loader/arch.c (100%) rename {sys/boot => stand}/mips/beri/loader/beri_console.c (100%) rename {sys/boot => stand}/mips/beri/loader/beri_disk_cfi.c (100%) rename {sys/boot => stand}/mips/beri/loader/beri_disk_sdcard.c (100%) rename {sys/boot => stand}/mips/beri/loader/devicename.c (100%) rename {sys/boot => stand}/mips/beri/loader/exec.c (100%) rename {sys/boot => stand}/mips/beri/loader/help.mips (100%) rename {sys/boot => stand}/mips/beri/loader/loader.h (100%) rename {sys/boot => stand}/mips/beri/loader/loader.ldscript (100%) rename {sys/boot => stand}/mips/beri/loader/main.c (100%) rename {sys/boot => stand}/mips/beri/loader/metadata.c (100%) rename {sys/boot => stand}/mips/beri/loader/start.S (100%) rename {sys/boot => stand}/mips/beri/loader/version (100%) rename {sys/boot => stand}/mips/uboot/Makefile (100%) rename {sys/boot => stand}/mips/uboot/conf.c (100%) rename {sys/boot => stand}/mips/uboot/help.uboot (100%) rename {sys/boot => stand}/mips/uboot/ldscript.mips (100%) rename {sys/boot => stand}/mips/uboot/loader.conf (100%) rename {sys/boot => stand}/mips/uboot/start.S (100%) rename {sys/boot => stand}/mips/uboot/version (100%) rename {sys/boot => stand}/ofw/Makefile (100%) rename {sys/boot => stand}/ofw/Makefile.inc (100%) rename {sys/boot => stand}/ofw/common/Makefile.inc (100%) rename {sys/boot => stand}/ofw/common/main.c (100%) rename {sys/boot => stand}/ofw/libofw/Makefile (100%) rename {sys/boot => stand}/ofw/libofw/devicename.c (100%) rename {sys/boot => stand}/ofw/libofw/elf_freebsd.c (100%) rename {sys/boot => stand}/ofw/libofw/libofw.h (100%) rename {sys/boot => stand}/ofw/libofw/ofw_console.c (100%) rename {sys/boot => stand}/ofw/libofw/ofw_copy.c (100%) rename {sys/boot => stand}/ofw/libofw/ofw_disk.c (100%) rename {sys/boot => stand}/ofw/libofw/ofw_memory.c (100%) rename {sys/boot => stand}/ofw/libofw/ofw_module.c (100%) rename {sys/boot => stand}/ofw/libofw/ofw_net.c (100%) rename {sys/boot => stand}/ofw/libofw/ofw_reboot.c (100%) rename {sys/boot => stand}/ofw/libofw/ofw_time.c (100%) rename {sys/boot => stand}/ofw/libofw/openfirm.c (100%) rename {sys/boot => stand}/ofw/libofw/openfirm.h (100%) rename {sys/boot => stand}/ofw/libofw/ppc64_elf_freebsd.c (100%) rename {sys/boot => stand}/powerpc/Makefile (100%) rename {sys/boot => stand}/powerpc/Makefile.inc (100%) rename {sys/boot => stand}/powerpc/boot1.chrp/Makefile (100%) rename {sys/boot => stand}/powerpc/boot1.chrp/Makefile.hfs (100%) rename {sys/boot => stand}/powerpc/boot1.chrp/boot1.c (100%) rename {sys/boot => stand}/powerpc/boot1.chrp/bootinfo.txt (100%) rename {sys/boot => stand}/powerpc/boot1.chrp/generate-hfs.sh (100%) rename {sys/boot => stand}/powerpc/boot1.chrp/hfs.tmpl.bz2.uu (100%) rename {sys/boot => stand}/powerpc/kboot/Makefile (100%) rename {sys/boot => stand}/powerpc/kboot/conf.c (100%) rename {sys/boot => stand}/powerpc/kboot/host_syscall.S (100%) rename {sys/boot => stand}/powerpc/kboot/host_syscall.h (100%) rename {sys/boot => stand}/powerpc/kboot/hostcons.c (100%) rename {sys/boot => stand}/powerpc/kboot/hostdisk.c (100%) rename {sys/boot => stand}/powerpc/kboot/kbootfdt.c (100%) rename {sys/boot => stand}/powerpc/kboot/kerneltramp.S (100%) rename {sys/boot => stand}/powerpc/kboot/ldscript.powerpc (100%) rename {sys/boot => stand}/powerpc/kboot/main.c (100%) rename {sys/boot => stand}/powerpc/kboot/metadata.c (100%) rename {sys/boot => stand}/powerpc/kboot/ppc64_elf_freebsd.c (100%) rename {sys/boot => stand}/powerpc/kboot/version (100%) rename {sys/boot => stand}/powerpc/ofw/Makefile (100%) rename {sys/boot => stand}/powerpc/ofw/conf.c (100%) rename {sys/boot => stand}/powerpc/ofw/ldscript.powerpc (100%) rename {sys/boot => stand}/powerpc/ofw/metadata.c (100%) rename {sys/boot => stand}/powerpc/ofw/ofwfdt.c (100%) rename {sys/boot => stand}/powerpc/ofw/start.c (100%) rename {sys/boot => stand}/powerpc/ofw/version (100%) rename {sys/boot => stand}/powerpc/ps3/Makefile (100%) rename {sys/boot => stand}/powerpc/ps3/conf.c (100%) rename {sys/boot => stand}/powerpc/ps3/devicename.c (100%) rename {sys/boot => stand}/powerpc/ps3/ldscript.powerpc (100%) rename {sys/boot => stand}/powerpc/ps3/lv1call.S (100%) rename {sys/boot => stand}/powerpc/ps3/lv1call.h (100%) rename {sys/boot => stand}/powerpc/ps3/main.c (100%) rename {sys/boot => stand}/powerpc/ps3/metadata.c (100%) rename {sys/boot => stand}/powerpc/ps3/ppc64_elf_freebsd.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3.h (100%) rename {sys/boot => stand}/powerpc/ps3/ps3bus.h (100%) rename {sys/boot => stand}/powerpc/ps3/ps3cdrom.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3cons.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3devdesc.h (100%) rename {sys/boot => stand}/powerpc/ps3/ps3disk.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3mmu.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3net.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3repo.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3repo.h (100%) rename {sys/boot => stand}/powerpc/ps3/ps3stor.c (100%) rename {sys/boot => stand}/powerpc/ps3/ps3stor.h (100%) rename {sys/boot => stand}/powerpc/ps3/start.S (100%) rename {sys/boot => stand}/powerpc/ps3/version (100%) rename {sys/boot => stand}/powerpc/uboot/Makefile (100%) rename {sys/boot => stand}/powerpc/uboot/conf.c (100%) rename {sys/boot => stand}/powerpc/uboot/ldscript.powerpc (100%) rename {sys/boot => stand}/powerpc/uboot/start.S (100%) rename {sys/boot => stand}/powerpc/uboot/version (100%) rename {sys/boot => stand}/sparc64/Makefile (100%) rename {sys/boot => stand}/sparc64/Makefile.inc (100%) rename {sys/boot => stand}/sparc64/boot1/Makefile (100%) rename {sys/boot => stand}/sparc64/boot1/_start.s (100%) rename {sys/boot => stand}/sparc64/boot1/boot1.c (100%) rename {sys/boot => stand}/sparc64/loader/Makefile (100%) rename {sys/boot => stand}/sparc64/loader/help.sparc64 (100%) rename {sys/boot => stand}/sparc64/loader/locore.S (100%) rename {sys/boot => stand}/sparc64/loader/main.c (100%) rename {sys/boot => stand}/sparc64/loader/metadata.c (100%) rename {sys/boot => stand}/sparc64/loader/version (100%) rename {sys/boot => stand}/sparc64/zfsboot/Makefile (100%) rename {sys/boot => stand}/sparc64/zfsloader/Makefile (100%) rename {sys/boot => stand}/uboot.mk (100%) rename {sys/boot => stand}/uboot/Makefile (100%) rename {sys/boot => stand}/uboot/Makefile.inc (100%) rename {sys/boot => stand}/uboot/common/main.c (100%) rename {sys/boot => stand}/uboot/common/metadata.c (100%) rename {sys/boot => stand}/uboot/fdt/Makefile (100%) rename {sys/boot => stand}/uboot/fdt/uboot_fdt.c (100%) rename {sys/boot => stand}/uboot/lib/Makefile (100%) rename {sys/boot => stand}/uboot/lib/api_public.h (100%) rename {sys/boot => stand}/uboot/lib/console.c (100%) rename {sys/boot => stand}/uboot/lib/copy.c (100%) rename {sys/boot => stand}/uboot/lib/devicename.c (100%) rename {sys/boot => stand}/uboot/lib/disk.c (100%) rename {sys/boot => stand}/uboot/lib/elf_freebsd.c (100%) rename {sys/boot => stand}/uboot/lib/glue.c (100%) rename {sys/boot => stand}/uboot/lib/glue.h (100%) rename {sys/boot => stand}/uboot/lib/libuboot.h (100%) rename {sys/boot => stand}/uboot/lib/module.c (100%) rename {sys/boot => stand}/uboot/lib/net.c (100%) rename {sys/boot => stand}/uboot/lib/reboot.c (100%) rename {sys/boot => stand}/uboot/lib/time.c (100%) rename {sys/boot => stand}/usb/Makefile (100%) rename {sys/boot => stand}/usb/Makefile.test (100%) rename {sys/boot => stand}/usb/bsd_usbloader_test.c (100%) rename {sys/boot => stand}/usb/storage/umass_common.c (100%) rename {sys/boot => stand}/usb/storage/umass_common.h (100%) rename {sys/boot => stand}/usb/storage/umass_loader.c (100%) rename {sys/boot => stand}/usb/tools/Makefile (100%) rename {sys/boot => stand}/usb/tools/sysinit.c (100%) rename {sys/boot => stand}/usb/usb_busdma_loader.c (100%) rename {sys/boot => stand}/usb/usbcore.mk (100%) rename {sys/boot => stand}/userboot/Makefile (100%) rename {sys/boot => stand}/userboot/Makefile.inc (100%) rename {sys/boot => stand}/userboot/test/Makefile (100%) rename {sys/boot => stand}/userboot/test/Makefile.depend (100%) rename {sys/boot => stand}/userboot/test/test.c (100%) rename {sys/boot => stand}/userboot/userboot.h (100%) rename {sys/boot => stand}/userboot/userboot/Makefile (100%) rename {sys/boot => stand}/userboot/userboot/Makefile.depend (80%) rename {sys/boot => stand}/userboot/userboot/autoload.c (100%) rename {sys/boot => stand}/userboot/userboot/biossmap.c (100%) rename {sys/boot => stand}/userboot/userboot/bootinfo.c (100%) rename {sys/boot => stand}/userboot/userboot/bootinfo32.c (100%) rename {sys/boot => stand}/userboot/userboot/bootinfo64.c (100%) rename {sys/boot => stand}/userboot/userboot/conf.c (100%) rename {sys/boot => stand}/userboot/userboot/copy.c (100%) rename {sys/boot => stand}/userboot/userboot/devicename.c (100%) rename {sys/boot => stand}/userboot/userboot/elf32_freebsd.c (100%) rename {sys/boot => stand}/userboot/userboot/elf64_freebsd.c (100%) rename {sys/boot => stand}/userboot/userboot/host.c (100%) rename {sys/boot => stand}/userboot/userboot/libuserboot.h (100%) rename {sys/boot => stand}/userboot/userboot/main.c (100%) rename {sys/boot => stand}/userboot/userboot/userboot_cons.c (100%) rename {sys/boot => stand}/userboot/userboot/userboot_disk.c (100%) rename {sys/boot => stand}/userboot/userboot/version (100%) rename {sys/boot => stand}/zfs/Makefile (100%) rename {sys/boot => stand}/zfs/Makefile.depend (100%) rename {sys/boot => stand}/zfs/devicename_stubs.c (100%) rename {sys/boot => stand}/zfs/libzfs.h (100%) rename {sys/boot => stand}/zfs/zfs.c (100%) rename {sys/boot => stand}/zfs/zfsimpl.c (100%) rename {sys/boot => stand}/zfs32/Makefile (100%) rename {sys/boot => stand}/zfs32/Makefile.depend (100%) delete mode 100644 sys/boot/i386/loader/Makefile.depend delete mode 100644 sys/boot/i386/zfsloader/Makefile.depend diff --git a/MAINTAINERS b/MAINTAINERS index 0483d469f1f2..e77e3037e91a 100644 --- 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 index 0b27de1c61ee..8c5ba9407c24 100644 --- 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 index b4368ce9e97c..66dd52ca2994 100644 --- a/lib/libefivar/Makefile +++ b/lib/libefivar/Makefile @@ -26,7 +26,7 @@ .include -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 index 1a41bce06a30..a01e417426c1 100644 --- 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 index 8636ddbfa8ba..216acae43a5a 100644 --- 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 index c445fea5df04..8883f9d40e21 100755 --- a/release/powerpc/generate-hfs.sh +++ b/release/powerpc/generate-hfs.sh @@ -32,7 +32,7 @@ cat > bootinfo.txt << EOF FreeBSD/powerpc bootloader FreeBSD - $FreeBSD: head/sys/boot/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10 + $FreeBSD: head/stand/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10 -31 00:52:31Z nwhitehorn $ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 78e7839d64e4..90adeed44d82 100644 --- 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 index b8eb8a0f3a16..1ac13420c9ee 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 900a77af2a22..a5772909f167 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 5278c66bd8f5..e2b5d0c1b07c 100644 --- 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 index 3fcbc25c727f..668ba21fb169 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 similarity index 100% rename from sys/boot/Makefile rename to stand/Makefile diff --git a/sys/boot/Makefile.amd64 b/stand/Makefile.amd64 similarity index 100% rename from sys/boot/Makefile.amd64 rename to stand/Makefile.amd64 diff --git a/sys/boot/Makefile.arm b/stand/Makefile.arm similarity index 100% rename from sys/boot/Makefile.arm rename to stand/Makefile.arm diff --git a/sys/boot/Makefile.arm64 b/stand/Makefile.arm64 similarity index 100% rename from sys/boot/Makefile.arm64 rename to stand/Makefile.arm64 diff --git a/sys/boot/Makefile.i386 b/stand/Makefile.i386 similarity index 100% rename from sys/boot/Makefile.i386 rename to stand/Makefile.i386 diff --git a/sys/boot/Makefile.inc b/stand/Makefile.inc similarity index 100% rename from sys/boot/Makefile.inc rename to stand/Makefile.inc diff --git a/sys/boot/Makefile.mips b/stand/Makefile.mips similarity index 100% rename from sys/boot/Makefile.mips rename to stand/Makefile.mips diff --git a/sys/boot/Makefile.powerpc b/stand/Makefile.powerpc similarity index 100% rename from sys/boot/Makefile.powerpc rename to stand/Makefile.powerpc diff --git a/sys/boot/Makefile.sparc64 b/stand/Makefile.sparc64 similarity index 100% rename from sys/boot/Makefile.sparc64 rename to stand/Makefile.sparc64 diff --git a/sys/boot/arm/Makefile b/stand/arm/Makefile similarity index 100% rename from sys/boot/arm/Makefile rename to stand/arm/Makefile diff --git a/sys/boot/arm/Makefile.inc b/stand/arm/Makefile.inc similarity index 100% rename from sys/boot/arm/Makefile.inc rename to stand/arm/Makefile.inc diff --git a/sys/boot/arm/loader/loader.conf b/stand/arm/loader/loader.conf similarity index 100% rename from sys/boot/arm/loader/loader.conf rename to stand/arm/loader/loader.conf diff --git a/sys/boot/arm/uboot/Makefile b/stand/arm/uboot/Makefile similarity index 100% rename from sys/boot/arm/uboot/Makefile rename to stand/arm/uboot/Makefile diff --git a/sys/boot/arm/uboot/conf.c b/stand/arm/uboot/conf.c similarity index 100% rename from sys/boot/arm/uboot/conf.c rename to stand/arm/uboot/conf.c diff --git a/sys/boot/arm/uboot/help.uboot b/stand/arm/uboot/help.uboot similarity index 100% rename from sys/boot/arm/uboot/help.uboot rename to stand/arm/uboot/help.uboot diff --git a/sys/boot/arm/uboot/ldscript.arm b/stand/arm/uboot/ldscript.arm similarity index 100% rename from sys/boot/arm/uboot/ldscript.arm rename to stand/arm/uboot/ldscript.arm diff --git a/sys/boot/arm/uboot/start.S b/stand/arm/uboot/start.S similarity index 100% rename from sys/boot/arm/uboot/start.S rename to stand/arm/uboot/start.S diff --git a/sys/boot/arm/uboot/version b/stand/arm/uboot/version similarity index 100% rename from sys/boot/arm/uboot/version rename to stand/arm/uboot/version diff --git a/sys/boot/arm64/Makefile b/stand/arm64/Makefile similarity index 100% rename from sys/boot/arm64/Makefile rename to stand/arm64/Makefile diff --git a/sys/boot/arm64/libarm64/cache.c b/stand/arm64/libarm64/cache.c similarity index 100% rename from sys/boot/arm64/libarm64/cache.c rename to stand/arm64/libarm64/cache.c diff --git a/sys/boot/arm64/libarm64/cache.h b/stand/arm64/libarm64/cache.h similarity index 100% rename from sys/boot/arm64/libarm64/cache.h rename to stand/arm64/libarm64/cache.h diff --git a/sys/boot/common/Makefile.depend b/stand/common/Makefile.depend similarity index 100% rename from sys/boot/common/Makefile.depend rename to stand/common/Makefile.depend diff --git a/sys/boot/common/bcache.c b/stand/common/bcache.c similarity index 100% rename from sys/boot/common/bcache.c rename to stand/common/bcache.c diff --git a/sys/boot/common/boot.c b/stand/common/boot.c similarity index 100% rename from sys/boot/common/boot.c rename to stand/common/boot.c diff --git a/sys/boot/common/bootstrap.h b/stand/common/bootstrap.h similarity index 100% rename from sys/boot/common/bootstrap.h rename to stand/common/bootstrap.h diff --git a/sys/boot/common/commands.c b/stand/common/commands.c similarity index 100% rename from sys/boot/common/commands.c rename to stand/common/commands.c diff --git a/sys/boot/common/console.c b/stand/common/console.c similarity index 100% rename from sys/boot/common/console.c rename to stand/common/console.c diff --git a/sys/boot/common/dev_net.c b/stand/common/dev_net.c similarity index 100% rename from sys/boot/common/dev_net.c rename to stand/common/dev_net.c diff --git a/sys/boot/common/dev_net.h b/stand/common/dev_net.h similarity index 100% rename from sys/boot/common/dev_net.h rename to stand/common/dev_net.h diff --git a/sys/boot/common/devopen.c b/stand/common/devopen.c similarity index 100% rename from sys/boot/common/devopen.c rename to stand/common/devopen.c diff --git a/sys/boot/common/disk.c b/stand/common/disk.c similarity index 100% rename from sys/boot/common/disk.c rename to stand/common/disk.c diff --git a/sys/boot/common/disk.h b/stand/common/disk.h similarity index 100% rename from sys/boot/common/disk.h rename to stand/common/disk.h diff --git a/sys/boot/common/help.common b/stand/common/help.common similarity index 100% rename from sys/boot/common/help.common rename to stand/common/help.common diff --git a/sys/boot/common/install.c b/stand/common/install.c similarity index 100% rename from sys/boot/common/install.c rename to stand/common/install.c diff --git a/sys/boot/common/interp.c b/stand/common/interp.c similarity index 100% rename from sys/boot/common/interp.c rename to stand/common/interp.c diff --git a/sys/boot/common/interp_backslash.c b/stand/common/interp_backslash.c similarity index 100% rename from sys/boot/common/interp_backslash.c rename to stand/common/interp_backslash.c diff --git a/sys/boot/common/interp_forth.c b/stand/common/interp_forth.c similarity index 100% rename from sys/boot/common/interp_forth.c rename to stand/common/interp_forth.c diff --git a/sys/boot/common/interp_parse.c b/stand/common/interp_parse.c similarity index 100% rename from sys/boot/common/interp_parse.c rename to stand/common/interp_parse.c diff --git a/sys/boot/common/isapnp.c b/stand/common/isapnp.c similarity index 100% rename from sys/boot/common/isapnp.c rename to stand/common/isapnp.c diff --git a/sys/boot/common/isapnp.h b/stand/common/isapnp.h similarity index 100% rename from sys/boot/common/isapnp.h rename to stand/common/isapnp.h diff --git a/sys/boot/common/load_elf.c b/stand/common/load_elf.c similarity index 100% rename from sys/boot/common/load_elf.c rename to stand/common/load_elf.c diff --git a/sys/boot/common/load_elf32.c b/stand/common/load_elf32.c similarity index 100% rename from sys/boot/common/load_elf32.c rename to stand/common/load_elf32.c diff --git a/sys/boot/common/load_elf32_obj.c b/stand/common/load_elf32_obj.c similarity index 100% rename from sys/boot/common/load_elf32_obj.c rename to stand/common/load_elf32_obj.c diff --git a/sys/boot/common/load_elf64.c b/stand/common/load_elf64.c similarity index 100% rename from sys/boot/common/load_elf64.c rename to stand/common/load_elf64.c diff --git a/sys/boot/common/load_elf64_obj.c b/stand/common/load_elf64_obj.c similarity index 100% rename from sys/boot/common/load_elf64_obj.c rename to stand/common/load_elf64_obj.c diff --git a/sys/boot/common/load_elf_obj.c b/stand/common/load_elf_obj.c similarity index 100% rename from sys/boot/common/load_elf_obj.c rename to stand/common/load_elf_obj.c diff --git a/sys/boot/common/ls.c b/stand/common/ls.c similarity index 100% rename from sys/boot/common/ls.c rename to stand/common/ls.c diff --git a/sys/boot/common/md.c b/stand/common/md.c similarity index 100% rename from sys/boot/common/md.c rename to stand/common/md.c diff --git a/sys/boot/common/merge_help.awk b/stand/common/merge_help.awk similarity index 100% rename from sys/boot/common/merge_help.awk rename to stand/common/merge_help.awk diff --git a/sys/boot/common/misc.c b/stand/common/misc.c similarity index 100% rename from sys/boot/common/misc.c rename to stand/common/misc.c diff --git a/sys/boot/common/module.c b/stand/common/module.c similarity index 100% rename from sys/boot/common/module.c rename to stand/common/module.c diff --git a/sys/boot/common/newvers.sh b/stand/common/newvers.sh similarity index 100% rename from sys/boot/common/newvers.sh rename to stand/common/newvers.sh diff --git a/sys/boot/common/part.c b/stand/common/part.c similarity index 100% rename from sys/boot/common/part.c rename to stand/common/part.c diff --git a/sys/boot/common/part.h b/stand/common/part.h similarity index 100% rename from sys/boot/common/part.h rename to stand/common/part.h diff --git a/sys/boot/common/paths.h b/stand/common/paths.h similarity index 100% rename from sys/boot/common/paths.h rename to stand/common/paths.h diff --git a/sys/boot/common/pnp.c b/stand/common/pnp.c similarity index 100% rename from sys/boot/common/pnp.c rename to stand/common/pnp.c diff --git a/sys/boot/common/rbx.h b/stand/common/rbx.h similarity index 100% rename from sys/boot/common/rbx.h rename to stand/common/rbx.h diff --git a/sys/boot/common/reloc_elf.c b/stand/common/reloc_elf.c similarity index 100% rename from sys/boot/common/reloc_elf.c rename to stand/common/reloc_elf.c diff --git a/sys/boot/common/reloc_elf32.c b/stand/common/reloc_elf32.c similarity index 100% rename from sys/boot/common/reloc_elf32.c rename to stand/common/reloc_elf32.c diff --git a/sys/boot/common/reloc_elf64.c b/stand/common/reloc_elf64.c similarity index 100% rename from sys/boot/common/reloc_elf64.c rename to stand/common/reloc_elf64.c diff --git a/sys/boot/common/self_reloc.c b/stand/common/self_reloc.c similarity index 100% rename from sys/boot/common/self_reloc.c rename to stand/common/self_reloc.c diff --git a/sys/boot/defs.mk b/stand/defs.mk similarity index 98% rename from sys/boot/defs.mk rename to stand/defs.mk index 2753e21bdb21..20e9a7786413 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 similarity index 100% rename from sys/boot/efi/Makefile rename to stand/efi/Makefile diff --git a/sys/boot/efi/Makefile.inc b/stand/efi/Makefile.inc similarity index 100% rename from sys/boot/efi/Makefile.inc rename to stand/efi/Makefile.inc diff --git a/sys/boot/efi/boot1/Makefile b/stand/efi/boot1/Makefile similarity index 100% rename from sys/boot/efi/boot1/Makefile rename to stand/efi/boot1/Makefile diff --git a/sys/boot/efi/boot1/Makefile.depend b/stand/efi/boot1/Makefile.depend similarity index 79% rename from sys/boot/efi/boot1/Makefile.depend rename to stand/efi/boot1/Makefile.depend index 813358d57274..ffc5430cceec 100644 --- a/sys/boot/efi/boot1/Makefile.depend +++ b/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 diff --git a/sys/boot/efi/boot1/Makefile.fat b/stand/efi/boot1/Makefile.fat similarity index 100% rename from sys/boot/efi/boot1/Makefile.fat rename to stand/efi/boot1/Makefile.fat diff --git a/sys/boot/efi/boot1/boot1.c b/stand/efi/boot1/boot1.c similarity index 100% rename from sys/boot/efi/boot1/boot1.c rename to stand/efi/boot1/boot1.c diff --git a/sys/boot/efi/boot1/boot_module.h b/stand/efi/boot1/boot_module.h similarity index 100% rename from sys/boot/efi/boot1/boot_module.h rename to 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 similarity index 100% rename from sys/boot/efi/boot1/fat-amd64.tmpl.xz rename to 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 similarity index 100% rename from sys/boot/efi/boot1/fat-arm.tmpl.xz rename to 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 similarity index 100% rename from sys/boot/efi/boot1/fat-arm64.tmpl.xz rename to 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 similarity index 100% rename from sys/boot/efi/boot1/fat-i386.tmpl.xz rename to stand/efi/boot1/fat-i386.tmpl.xz diff --git a/sys/boot/efi/boot1/generate-fat.sh b/stand/efi/boot1/generate-fat.sh similarity index 100% rename from sys/boot/efi/boot1/generate-fat.sh rename to stand/efi/boot1/generate-fat.sh diff --git a/sys/boot/efi/boot1/ufs_module.c b/stand/efi/boot1/ufs_module.c similarity index 100% rename from sys/boot/efi/boot1/ufs_module.c rename to stand/efi/boot1/ufs_module.c diff --git a/sys/boot/efi/boot1/zfs_module.c b/stand/efi/boot1/zfs_module.c similarity index 100% rename from sys/boot/efi/boot1/zfs_module.c rename to stand/efi/boot1/zfs_module.c diff --git a/sys/boot/efi/fdt/Makefile b/stand/efi/fdt/Makefile similarity index 100% rename from sys/boot/efi/fdt/Makefile rename to stand/efi/fdt/Makefile diff --git a/sys/boot/efi/fdt/Makefile.depend b/stand/efi/fdt/Makefile.depend similarity index 100% rename from sys/boot/efi/fdt/Makefile.depend rename to stand/efi/fdt/Makefile.depend diff --git a/sys/boot/efi/fdt/efi_fdt.c b/stand/efi/fdt/efi_fdt.c similarity index 100% rename from sys/boot/efi/fdt/efi_fdt.c rename to stand/efi/fdt/efi_fdt.c diff --git a/sys/boot/efi/include/README b/stand/efi/include/README similarity index 100% rename from sys/boot/efi/include/README rename to stand/efi/include/README diff --git a/sys/boot/efi/include/amd64/efibind.h b/stand/efi/include/amd64/efibind.h similarity index 100% rename from sys/boot/efi/include/amd64/efibind.h rename to stand/efi/include/amd64/efibind.h diff --git a/sys/boot/efi/include/amd64/pe.h b/stand/efi/include/amd64/pe.h similarity index 100% rename from sys/boot/efi/include/amd64/pe.h rename to stand/efi/include/amd64/pe.h diff --git a/sys/boot/efi/include/arm/efibind.h b/stand/efi/include/arm/efibind.h similarity index 100% rename from sys/boot/efi/include/arm/efibind.h rename to stand/efi/include/arm/efibind.h diff --git a/sys/boot/efi/include/arm64/efibind.h b/stand/efi/include/arm64/efibind.h similarity index 100% rename from sys/boot/efi/include/arm64/efibind.h rename to stand/efi/include/arm64/efibind.h diff --git a/sys/boot/efi/include/efi.h b/stand/efi/include/efi.h similarity index 100% rename from sys/boot/efi/include/efi.h rename to stand/efi/include/efi.h diff --git a/sys/boot/efi/include/efi_driver_utils.h b/stand/efi/include/efi_driver_utils.h similarity index 100% rename from sys/boot/efi/include/efi_driver_utils.h rename to stand/efi/include/efi_driver_utils.h diff --git a/sys/boot/efi/include/efi_drivers.h b/stand/efi/include/efi_drivers.h similarity index 100% rename from sys/boot/efi/include/efi_drivers.h rename to stand/efi/include/efi_drivers.h diff --git a/sys/boot/efi/include/efi_nii.h b/stand/efi/include/efi_nii.h similarity index 100% rename from sys/boot/efi/include/efi_nii.h rename to stand/efi/include/efi_nii.h diff --git a/sys/boot/efi/include/efiapi.h b/stand/efi/include/efiapi.h similarity index 100% rename from sys/boot/efi/include/efiapi.h rename to stand/efi/include/efiapi.h diff --git a/sys/boot/efi/include/efichar.h b/stand/efi/include/efichar.h similarity index 100% rename from sys/boot/efi/include/efichar.h rename to stand/efi/include/efichar.h diff --git a/sys/boot/efi/include/eficon.h b/stand/efi/include/eficon.h similarity index 100% rename from sys/boot/efi/include/eficon.h rename to stand/efi/include/eficon.h diff --git a/sys/boot/efi/include/eficonsctl.h b/stand/efi/include/eficonsctl.h similarity index 100% rename from sys/boot/efi/include/eficonsctl.h rename to stand/efi/include/eficonsctl.h diff --git a/sys/boot/efi/include/efidebug.h b/stand/efi/include/efidebug.h similarity index 100% rename from sys/boot/efi/include/efidebug.h rename to stand/efi/include/efidebug.h diff --git a/sys/boot/efi/include/efidef.h b/stand/efi/include/efidef.h similarity index 100% rename from sys/boot/efi/include/efidef.h rename to stand/efi/include/efidef.h diff --git a/sys/boot/efi/include/efidevp.h b/stand/efi/include/efidevp.h similarity index 100% rename from sys/boot/efi/include/efidevp.h rename to stand/efi/include/efidevp.h diff --git a/sys/boot/efi/include/efierr.h b/stand/efi/include/efierr.h similarity index 100% rename from sys/boot/efi/include/efierr.h rename to stand/efi/include/efierr.h diff --git a/sys/boot/efi/include/efifpswa.h b/stand/efi/include/efifpswa.h similarity index 100% rename from sys/boot/efi/include/efifpswa.h rename to stand/efi/include/efifpswa.h diff --git a/sys/boot/efi/include/efifs.h b/stand/efi/include/efifs.h similarity index 100% rename from sys/boot/efi/include/efifs.h rename to stand/efi/include/efifs.h diff --git a/sys/boot/efi/include/efigop.h b/stand/efi/include/efigop.h similarity index 100% rename from sys/boot/efi/include/efigop.h rename to stand/efi/include/efigop.h diff --git a/sys/boot/efi/include/efilib.h b/stand/efi/include/efilib.h similarity index 100% rename from sys/boot/efi/include/efilib.h rename to stand/efi/include/efilib.h diff --git a/sys/boot/efi/include/efinet.h b/stand/efi/include/efinet.h similarity index 100% rename from sys/boot/efi/include/efinet.h rename to stand/efi/include/efinet.h diff --git a/sys/boot/efi/include/efipart.h b/stand/efi/include/efipart.h similarity index 100% rename from sys/boot/efi/include/efipart.h rename to stand/efi/include/efipart.h diff --git a/sys/boot/efi/include/efipciio.h b/stand/efi/include/efipciio.h similarity index 100% rename from sys/boot/efi/include/efipciio.h rename to stand/efi/include/efipciio.h diff --git a/sys/boot/efi/include/efiprot.h b/stand/efi/include/efiprot.h similarity index 100% rename from sys/boot/efi/include/efiprot.h rename to stand/efi/include/efiprot.h diff --git a/sys/boot/efi/include/efipxebc.h b/stand/efi/include/efipxebc.h similarity index 100% rename from sys/boot/efi/include/efipxebc.h rename to stand/efi/include/efipxebc.h diff --git a/sys/boot/efi/include/efiser.h b/stand/efi/include/efiser.h similarity index 100% rename from sys/boot/efi/include/efiser.h rename to stand/efi/include/efiser.h diff --git a/sys/boot/efi/include/efistdarg.h b/stand/efi/include/efistdarg.h similarity index 100% rename from sys/boot/efi/include/efistdarg.h rename to stand/efi/include/efistdarg.h diff --git a/sys/boot/efi/include/efiuga.h b/stand/efi/include/efiuga.h similarity index 100% rename from sys/boot/efi/include/efiuga.h rename to stand/efi/include/efiuga.h diff --git a/sys/boot/efi/include/efizfs.h b/stand/efi/include/efizfs.h similarity index 100% rename from sys/boot/efi/include/efizfs.h rename to stand/efi/include/efizfs.h diff --git a/sys/boot/efi/include/i386/efibind.h b/stand/efi/include/i386/efibind.h similarity index 100% rename from sys/boot/efi/include/i386/efibind.h rename to stand/efi/include/i386/efibind.h diff --git a/sys/boot/efi/include/i386/pe.h b/stand/efi/include/i386/pe.h similarity index 100% rename from sys/boot/efi/include/i386/pe.h rename to stand/efi/include/i386/pe.h diff --git a/sys/boot/efi/libefi/Makefile b/stand/efi/libefi/Makefile similarity index 100% rename from sys/boot/efi/libefi/Makefile rename to stand/efi/libefi/Makefile diff --git a/sys/boot/efi/libefi/Makefile.depend b/stand/efi/libefi/Makefile.depend similarity index 100% rename from sys/boot/efi/libefi/Makefile.depend rename to stand/efi/libefi/Makefile.depend diff --git a/sys/boot/efi/libefi/delay.c b/stand/efi/libefi/delay.c similarity index 100% rename from sys/boot/efi/libefi/delay.c rename to stand/efi/libefi/delay.c diff --git a/sys/boot/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c similarity index 100% rename from sys/boot/efi/libefi/devicename.c rename to stand/efi/libefi/devicename.c diff --git a/sys/boot/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c similarity index 100% rename from sys/boot/efi/libefi/devpath.c rename to stand/efi/libefi/devpath.c diff --git a/sys/boot/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c similarity index 100% rename from sys/boot/efi/libefi/efi_console.c rename to 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 similarity index 100% rename from sys/boot/efi/libefi/efi_driver_utils.c rename to stand/efi/libefi/efi_driver_utils.c diff --git a/sys/boot/efi/libefi/efichar.c b/stand/efi/libefi/efichar.c similarity index 100% rename from sys/boot/efi/libefi/efichar.c rename to stand/efi/libefi/efichar.c diff --git a/sys/boot/efi/libefi/efinet.c b/stand/efi/libefi/efinet.c similarity index 100% rename from sys/boot/efi/libefi/efinet.c rename to stand/efi/libefi/efinet.c diff --git a/sys/boot/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c similarity index 100% rename from sys/boot/efi/libefi/efipart.c rename to stand/efi/libefi/efipart.c diff --git a/sys/boot/efi/libefi/efizfs.c b/stand/efi/libefi/efizfs.c similarity index 100% rename from sys/boot/efi/libefi/efizfs.c rename to stand/efi/libefi/efizfs.c diff --git a/sys/boot/efi/libefi/env.c b/stand/efi/libefi/env.c similarity index 100% rename from sys/boot/efi/libefi/env.c rename to stand/efi/libefi/env.c diff --git a/sys/boot/efi/libefi/errno.c b/stand/efi/libefi/errno.c similarity index 100% rename from sys/boot/efi/libefi/errno.c rename to stand/efi/libefi/errno.c diff --git a/sys/boot/efi/libefi/handles.c b/stand/efi/libefi/handles.c similarity index 100% rename from sys/boot/efi/libefi/handles.c rename to stand/efi/libefi/handles.c diff --git a/sys/boot/efi/libefi/libefi.c b/stand/efi/libefi/libefi.c similarity index 100% rename from sys/boot/efi/libefi/libefi.c rename to stand/efi/libefi/libefi.c diff --git a/sys/boot/efi/libefi/time.c b/stand/efi/libefi/time.c similarity index 100% rename from sys/boot/efi/libefi/time.c rename to stand/efi/libefi/time.c diff --git a/sys/boot/efi/libefi/time_event.c b/stand/efi/libefi/time_event.c similarity index 100% rename from sys/boot/efi/libefi/time_event.c rename to stand/efi/libefi/time_event.c diff --git a/sys/boot/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c similarity index 100% rename from sys/boot/efi/libefi/wchar.c rename to stand/efi/libefi/wchar.c diff --git a/sys/boot/efi/loader/Makefile b/stand/efi/loader/Makefile similarity index 100% rename from sys/boot/efi/loader/Makefile rename to stand/efi/loader/Makefile diff --git a/sys/boot/efi/loader/Makefile.depend b/stand/efi/loader/Makefile.depend similarity index 73% rename from sys/boot/efi/loader/Makefile.depend rename to stand/efi/loader/Makefile.depend index 6eec9589d9fa..657c40116b4d 100644 --- a/sys/boot/efi/loader/Makefile.depend +++ b/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 diff --git a/sys/boot/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc similarity index 100% rename from sys/boot/efi/loader/arch/amd64/Makefile.inc rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/amd64/amd64_tramp.S rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/amd64/elf64_freebsd.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/amd64/exc.S rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/amd64/ldscript.amd64 rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/amd64/start.S rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/amd64/trap.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm/Makefile.inc rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm/exec.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm/ldscript.arm rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm/start.S rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm64/Makefile.inc rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm64/exec.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm64/ldscript.arm64 rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/arm64/start.S rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/Makefile.inc rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/bootinfo.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/efimd.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/elf32_freebsd.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/exec.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/i386_copy.c rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/ldscript.i386 rename to 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 similarity index 100% rename from sys/boot/efi/loader/arch/i386/start.S rename to stand/efi/loader/arch/i386/start.S diff --git a/sys/boot/efi/loader/autoload.c b/stand/efi/loader/autoload.c similarity index 100% rename from sys/boot/efi/loader/autoload.c rename to stand/efi/loader/autoload.c diff --git a/sys/boot/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c similarity index 100% rename from sys/boot/efi/loader/bootinfo.c rename to stand/efi/loader/bootinfo.c diff --git a/sys/boot/efi/loader/conf.c b/stand/efi/loader/conf.c similarity index 100% rename from sys/boot/efi/loader/conf.c rename to stand/efi/loader/conf.c diff --git a/sys/boot/efi/loader/copy.c b/stand/efi/loader/copy.c similarity index 100% rename from sys/boot/efi/loader/copy.c rename to stand/efi/loader/copy.c diff --git a/sys/boot/efi/loader/efi_main.c b/stand/efi/loader/efi_main.c similarity index 100% rename from sys/boot/efi/loader/efi_main.c rename to stand/efi/loader/efi_main.c diff --git a/sys/boot/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c similarity index 100% rename from sys/boot/efi/loader/framebuffer.c rename to stand/efi/loader/framebuffer.c diff --git a/sys/boot/efi/loader/framebuffer.h b/stand/efi/loader/framebuffer.h similarity index 100% rename from sys/boot/efi/loader/framebuffer.h rename to stand/efi/loader/framebuffer.h diff --git a/sys/boot/efi/loader/loader_efi.h b/stand/efi/loader/loader_efi.h similarity index 100% rename from sys/boot/efi/loader/loader_efi.h rename to stand/efi/loader/loader_efi.h diff --git a/sys/boot/efi/loader/main.c b/stand/efi/loader/main.c similarity index 100% rename from sys/boot/efi/loader/main.c rename to stand/efi/loader/main.c diff --git a/sys/boot/efi/loader/version b/stand/efi/loader/version similarity index 100% rename from sys/boot/efi/loader/version rename to stand/efi/loader/version diff --git a/sys/boot/fdt.mk b/stand/fdt.mk similarity index 100% rename from sys/boot/fdt.mk rename to stand/fdt.mk diff --git a/sys/boot/fdt/Makefile b/stand/fdt/Makefile similarity index 100% rename from sys/boot/fdt/Makefile rename to stand/fdt/Makefile diff --git a/sys/boot/fdt/Makefile.depend b/stand/fdt/Makefile.depend similarity index 100% rename from sys/boot/fdt/Makefile.depend rename to stand/fdt/Makefile.depend diff --git a/sys/boot/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c similarity index 100% rename from sys/boot/fdt/fdt_loader_cmd.c rename to stand/fdt/fdt_loader_cmd.c diff --git a/sys/boot/fdt/fdt_overlay.c b/stand/fdt/fdt_overlay.c similarity index 100% rename from sys/boot/fdt/fdt_overlay.c rename to stand/fdt/fdt_overlay.c diff --git a/sys/boot/fdt/fdt_overlay.h b/stand/fdt/fdt_overlay.h similarity index 100% rename from sys/boot/fdt/fdt_overlay.h rename to stand/fdt/fdt_overlay.h diff --git a/sys/boot/fdt/fdt_platform.h b/stand/fdt/fdt_platform.h similarity index 100% rename from sys/boot/fdt/fdt_platform.h rename to stand/fdt/fdt_platform.h diff --git a/sys/boot/fdt/help.fdt b/stand/fdt/help.fdt similarity index 100% rename from sys/boot/fdt/help.fdt rename to stand/fdt/help.fdt diff --git a/sys/boot/ficl.mk b/stand/ficl.mk similarity index 100% rename from sys/boot/ficl.mk rename to stand/ficl.mk diff --git a/sys/boot/ficl/Makefile b/stand/ficl/Makefile similarity index 100% rename from sys/boot/ficl/Makefile rename to stand/ficl/Makefile diff --git a/sys/boot/ficl/Makefile.depend b/stand/ficl/Makefile.depend similarity index 100% rename from sys/boot/ficl/Makefile.depend rename to stand/ficl/Makefile.depend diff --git a/sys/boot/ficl/aarch64/sysdep.c b/stand/ficl/aarch64/sysdep.c similarity index 100% rename from sys/boot/ficl/aarch64/sysdep.c rename to stand/ficl/aarch64/sysdep.c diff --git a/sys/boot/ficl/aarch64/sysdep.h b/stand/ficl/aarch64/sysdep.h similarity index 100% rename from sys/boot/ficl/aarch64/sysdep.h rename to stand/ficl/aarch64/sysdep.h diff --git a/sys/boot/ficl/amd64/sysdep.c b/stand/ficl/amd64/sysdep.c similarity index 100% rename from sys/boot/ficl/amd64/sysdep.c rename to stand/ficl/amd64/sysdep.c diff --git a/sys/boot/ficl/amd64/sysdep.h b/stand/ficl/amd64/sysdep.h similarity index 100% rename from sys/boot/ficl/amd64/sysdep.h rename to stand/ficl/amd64/sysdep.h diff --git a/sys/boot/ficl/arm/sysdep.c b/stand/ficl/arm/sysdep.c similarity index 100% rename from sys/boot/ficl/arm/sysdep.c rename to stand/ficl/arm/sysdep.c diff --git a/sys/boot/ficl/arm/sysdep.h b/stand/ficl/arm/sysdep.h similarity index 100% rename from sys/boot/ficl/arm/sysdep.h rename to stand/ficl/arm/sysdep.h diff --git a/sys/boot/ficl/dict.c b/stand/ficl/dict.c similarity index 100% rename from sys/boot/ficl/dict.c rename to stand/ficl/dict.c diff --git a/sys/boot/ficl/ficl.c b/stand/ficl/ficl.c similarity index 100% rename from sys/boot/ficl/ficl.c rename to stand/ficl/ficl.c diff --git a/sys/boot/ficl/ficl.h b/stand/ficl/ficl.h similarity index 100% rename from sys/boot/ficl/ficl.h rename to stand/ficl/ficl.h diff --git a/sys/boot/ficl/fileaccess.c b/stand/ficl/fileaccess.c similarity index 100% rename from sys/boot/ficl/fileaccess.c rename to stand/ficl/fileaccess.c diff --git a/sys/boot/ficl/float.c b/stand/ficl/float.c similarity index 100% rename from sys/boot/ficl/float.c rename to stand/ficl/float.c diff --git a/sys/boot/ficl/i386/sysdep.c b/stand/ficl/i386/sysdep.c similarity index 100% rename from sys/boot/ficl/i386/sysdep.c rename to stand/ficl/i386/sysdep.c diff --git a/sys/boot/ficl/i386/sysdep.h b/stand/ficl/i386/sysdep.h similarity index 100% rename from sys/boot/ficl/i386/sysdep.h rename to stand/ficl/i386/sysdep.h diff --git a/sys/boot/ficl/loader.c b/stand/ficl/loader.c similarity index 100% rename from sys/boot/ficl/loader.c rename to stand/ficl/loader.c diff --git a/sys/boot/ficl/math64.c b/stand/ficl/math64.c similarity index 100% rename from sys/boot/ficl/math64.c rename to stand/ficl/math64.c diff --git a/sys/boot/ficl/math64.h b/stand/ficl/math64.h similarity index 100% rename from sys/boot/ficl/math64.h rename to stand/ficl/math64.h diff --git a/sys/boot/ficl/mips/sysdep.c b/stand/ficl/mips/sysdep.c similarity index 100% rename from sys/boot/ficl/mips/sysdep.c rename to stand/ficl/mips/sysdep.c diff --git a/sys/boot/ficl/mips/sysdep.h b/stand/ficl/mips/sysdep.h similarity index 100% rename from sys/boot/ficl/mips/sysdep.h rename to stand/ficl/mips/sysdep.h diff --git a/sys/boot/ficl/mips64/sysdep.c b/stand/ficl/mips64/sysdep.c similarity index 100% rename from sys/boot/ficl/mips64/sysdep.c rename to stand/ficl/mips64/sysdep.c diff --git a/sys/boot/ficl/mips64/sysdep.h b/stand/ficl/mips64/sysdep.h similarity index 100% rename from sys/boot/ficl/mips64/sysdep.h rename to stand/ficl/mips64/sysdep.h diff --git a/sys/boot/ficl/powerpc/sysdep.c b/stand/ficl/powerpc/sysdep.c similarity index 100% rename from sys/boot/ficl/powerpc/sysdep.c rename to stand/ficl/powerpc/sysdep.c diff --git a/sys/boot/ficl/powerpc/sysdep.h b/stand/ficl/powerpc/sysdep.h similarity index 100% rename from sys/boot/ficl/powerpc/sysdep.h rename to stand/ficl/powerpc/sysdep.h diff --git a/sys/boot/ficl/prefix.c b/stand/ficl/prefix.c similarity index 100% rename from sys/boot/ficl/prefix.c rename to stand/ficl/prefix.c diff --git a/sys/boot/ficl/riscv/sysdep.c b/stand/ficl/riscv/sysdep.c similarity index 100% rename from sys/boot/ficl/riscv/sysdep.c rename to stand/ficl/riscv/sysdep.c diff --git a/sys/boot/ficl/riscv/sysdep.h b/stand/ficl/riscv/sysdep.h similarity index 100% rename from sys/boot/ficl/riscv/sysdep.h rename to stand/ficl/riscv/sysdep.h diff --git a/sys/boot/ficl/search.c b/stand/ficl/search.c similarity index 100% rename from sys/boot/ficl/search.c rename to stand/ficl/search.c diff --git a/sys/boot/ficl/softwords/classes.fr b/stand/ficl/softwords/classes.fr similarity index 100% rename from sys/boot/ficl/softwords/classes.fr rename to stand/ficl/softwords/classes.fr diff --git a/sys/boot/ficl/softwords/ficlclass.fr b/stand/ficl/softwords/ficlclass.fr similarity index 100% rename from sys/boot/ficl/softwords/ficlclass.fr rename to stand/ficl/softwords/ficlclass.fr diff --git a/sys/boot/ficl/softwords/ficllocal.fr b/stand/ficl/softwords/ficllocal.fr similarity index 100% rename from sys/boot/ficl/softwords/ficllocal.fr rename to stand/ficl/softwords/ficllocal.fr diff --git a/sys/boot/ficl/softwords/fileaccess.fr b/stand/ficl/softwords/fileaccess.fr similarity index 100% rename from sys/boot/ficl/softwords/fileaccess.fr rename to stand/ficl/softwords/fileaccess.fr diff --git a/sys/boot/ficl/softwords/forml.fr b/stand/ficl/softwords/forml.fr similarity index 100% rename from sys/boot/ficl/softwords/forml.fr rename to stand/ficl/softwords/forml.fr diff --git a/sys/boot/ficl/softwords/freebsd.fr b/stand/ficl/softwords/freebsd.fr similarity index 100% rename from sys/boot/ficl/softwords/freebsd.fr rename to stand/ficl/softwords/freebsd.fr diff --git a/sys/boot/ficl/softwords/ifbrack.fr b/stand/ficl/softwords/ifbrack.fr similarity index 100% rename from sys/boot/ficl/softwords/ifbrack.fr rename to stand/ficl/softwords/ifbrack.fr diff --git a/sys/boot/ficl/softwords/jhlocal.fr b/stand/ficl/softwords/jhlocal.fr similarity index 100% rename from sys/boot/ficl/softwords/jhlocal.fr rename to stand/ficl/softwords/jhlocal.fr diff --git a/sys/boot/ficl/softwords/marker.fr b/stand/ficl/softwords/marker.fr similarity index 100% rename from sys/boot/ficl/softwords/marker.fr rename to stand/ficl/softwords/marker.fr diff --git a/sys/boot/ficl/softwords/oo.fr b/stand/ficl/softwords/oo.fr similarity index 100% rename from sys/boot/ficl/softwords/oo.fr rename to stand/ficl/softwords/oo.fr diff --git a/sys/boot/ficl/softwords/prefix.fr b/stand/ficl/softwords/prefix.fr similarity index 100% rename from sys/boot/ficl/softwords/prefix.fr rename to stand/ficl/softwords/prefix.fr diff --git a/sys/boot/ficl/softwords/softcore.awk b/stand/ficl/softwords/softcore.awk similarity index 100% rename from sys/boot/ficl/softwords/softcore.awk rename to stand/ficl/softwords/softcore.awk diff --git a/sys/boot/ficl/softwords/softcore.fr b/stand/ficl/softwords/softcore.fr similarity index 100% rename from sys/boot/ficl/softwords/softcore.fr rename to stand/ficl/softwords/softcore.fr diff --git a/sys/boot/ficl/softwords/string.fr b/stand/ficl/softwords/string.fr similarity index 100% rename from sys/boot/ficl/softwords/string.fr rename to stand/ficl/softwords/string.fr diff --git a/sys/boot/ficl/sparc64/sysdep.c b/stand/ficl/sparc64/sysdep.c similarity index 100% rename from sys/boot/ficl/sparc64/sysdep.c rename to stand/ficl/sparc64/sysdep.c diff --git a/sys/boot/ficl/sparc64/sysdep.h b/stand/ficl/sparc64/sysdep.h similarity index 100% rename from sys/boot/ficl/sparc64/sysdep.h rename to stand/ficl/sparc64/sysdep.h diff --git a/sys/boot/ficl/stack.c b/stand/ficl/stack.c similarity index 100% rename from sys/boot/ficl/stack.c rename to stand/ficl/stack.c diff --git a/sys/boot/ficl/testmain.c b/stand/ficl/testmain.c similarity index 100% rename from sys/boot/ficl/testmain.c rename to stand/ficl/testmain.c diff --git a/sys/boot/ficl/tools.c b/stand/ficl/tools.c similarity index 100% rename from sys/boot/ficl/tools.c rename to stand/ficl/tools.c diff --git a/sys/boot/ficl/unix.c b/stand/ficl/unix.c similarity index 100% rename from sys/boot/ficl/unix.c rename to stand/ficl/unix.c diff --git a/sys/boot/ficl/vm.c b/stand/ficl/vm.c similarity index 100% rename from sys/boot/ficl/vm.c rename to stand/ficl/vm.c diff --git a/sys/boot/ficl/words.c b/stand/ficl/words.c similarity index 100% rename from sys/boot/ficl/words.c rename to stand/ficl/words.c diff --git a/sys/boot/ficl32/Makefile b/stand/ficl32/Makefile similarity index 100% rename from sys/boot/ficl32/Makefile rename to stand/ficl32/Makefile diff --git a/sys/boot/ficl32/Makefile.depend b/stand/ficl32/Makefile.depend similarity index 100% rename from sys/boot/ficl32/Makefile.depend rename to stand/ficl32/Makefile.depend diff --git a/sys/boot/forth/Makefile b/stand/forth/Makefile similarity index 100% rename from sys/boot/forth/Makefile rename to stand/forth/Makefile diff --git a/sys/boot/forth/Makefile.depend b/stand/forth/Makefile.depend similarity index 100% rename from sys/boot/forth/Makefile.depend rename to stand/forth/Makefile.depend diff --git a/sys/boot/forth/beastie.4th b/stand/forth/beastie.4th similarity index 100% rename from sys/boot/forth/beastie.4th rename to stand/forth/beastie.4th diff --git a/sys/boot/forth/beastie.4th.8 b/stand/forth/beastie.4th.8 similarity index 100% rename from sys/boot/forth/beastie.4th.8 rename to stand/forth/beastie.4th.8 diff --git a/sys/boot/forth/brand-fbsd.4th b/stand/forth/brand-fbsd.4th similarity index 100% rename from sys/boot/forth/brand-fbsd.4th rename to stand/forth/brand-fbsd.4th diff --git a/sys/boot/forth/brand.4th b/stand/forth/brand.4th similarity index 100% rename from sys/boot/forth/brand.4th rename to stand/forth/brand.4th diff --git a/sys/boot/forth/brand.4th.8 b/stand/forth/brand.4th.8 similarity index 100% rename from sys/boot/forth/brand.4th.8 rename to stand/forth/brand.4th.8 diff --git a/sys/boot/forth/check-password.4th b/stand/forth/check-password.4th similarity index 100% rename from sys/boot/forth/check-password.4th rename to stand/forth/check-password.4th diff --git a/sys/boot/forth/check-password.4th.8 b/stand/forth/check-password.4th.8 similarity index 100% rename from sys/boot/forth/check-password.4th.8 rename to stand/forth/check-password.4th.8 diff --git a/sys/boot/forth/color.4th b/stand/forth/color.4th similarity index 100% rename from sys/boot/forth/color.4th rename to stand/forth/color.4th diff --git a/sys/boot/forth/color.4th.8 b/stand/forth/color.4th.8 similarity index 100% rename from sys/boot/forth/color.4th.8 rename to stand/forth/color.4th.8 diff --git a/sys/boot/forth/delay.4th b/stand/forth/delay.4th similarity index 100% rename from sys/boot/forth/delay.4th rename to stand/forth/delay.4th diff --git a/sys/boot/forth/delay.4th.8 b/stand/forth/delay.4th.8 similarity index 100% rename from sys/boot/forth/delay.4th.8 rename to stand/forth/delay.4th.8 diff --git a/sys/boot/forth/efi.4th b/stand/forth/efi.4th similarity index 100% rename from sys/boot/forth/efi.4th rename to stand/forth/efi.4th diff --git a/sys/boot/forth/frames.4th b/stand/forth/frames.4th similarity index 100% rename from sys/boot/forth/frames.4th rename to stand/forth/frames.4th diff --git a/sys/boot/forth/loader.4th b/stand/forth/loader.4th similarity index 100% rename from sys/boot/forth/loader.4th rename to stand/forth/loader.4th diff --git a/sys/boot/forth/loader.4th.8 b/stand/forth/loader.4th.8 similarity index 100% rename from sys/boot/forth/loader.4th.8 rename to stand/forth/loader.4th.8 diff --git a/sys/boot/forth/loader.conf b/stand/forth/loader.conf similarity index 100% rename from sys/boot/forth/loader.conf rename to stand/forth/loader.conf diff --git a/sys/boot/forth/loader.conf.5 b/stand/forth/loader.conf.5 similarity index 100% rename from sys/boot/forth/loader.conf.5 rename to stand/forth/loader.conf.5 diff --git a/sys/boot/forth/loader.rc b/stand/forth/loader.rc similarity index 100% rename from sys/boot/forth/loader.rc rename to stand/forth/loader.rc diff --git a/sys/boot/forth/logo-beastie.4th b/stand/forth/logo-beastie.4th similarity index 100% rename from sys/boot/forth/logo-beastie.4th rename to stand/forth/logo-beastie.4th diff --git a/sys/boot/forth/logo-beastiebw.4th b/stand/forth/logo-beastiebw.4th similarity index 100% rename from sys/boot/forth/logo-beastiebw.4th rename to stand/forth/logo-beastiebw.4th diff --git a/sys/boot/forth/logo-fbsdbw.4th b/stand/forth/logo-fbsdbw.4th similarity index 100% rename from sys/boot/forth/logo-fbsdbw.4th rename to stand/forth/logo-fbsdbw.4th diff --git a/sys/boot/forth/logo-orb.4th b/stand/forth/logo-orb.4th similarity index 100% rename from sys/boot/forth/logo-orb.4th rename to stand/forth/logo-orb.4th diff --git a/sys/boot/forth/logo-orbbw.4th b/stand/forth/logo-orbbw.4th similarity index 100% rename from sys/boot/forth/logo-orbbw.4th rename to stand/forth/logo-orbbw.4th diff --git a/sys/boot/forth/menu-commands.4th b/stand/forth/menu-commands.4th similarity index 100% rename from sys/boot/forth/menu-commands.4th rename to stand/forth/menu-commands.4th diff --git a/sys/boot/forth/menu.4th b/stand/forth/menu.4th similarity index 100% rename from sys/boot/forth/menu.4th rename to stand/forth/menu.4th diff --git a/sys/boot/forth/menu.4th.8 b/stand/forth/menu.4th.8 similarity index 100% rename from sys/boot/forth/menu.4th.8 rename to stand/forth/menu.4th.8 diff --git a/sys/boot/forth/menu.rc b/stand/forth/menu.rc similarity index 100% rename from sys/boot/forth/menu.rc rename to stand/forth/menu.rc diff --git a/sys/boot/forth/menusets.4th b/stand/forth/menusets.4th similarity index 100% rename from sys/boot/forth/menusets.4th rename to stand/forth/menusets.4th diff --git a/sys/boot/forth/menusets.4th.8 b/stand/forth/menusets.4th.8 similarity index 100% rename from sys/boot/forth/menusets.4th.8 rename to stand/forth/menusets.4th.8 diff --git a/sys/boot/forth/pcibios.4th b/stand/forth/pcibios.4th similarity index 100% rename from sys/boot/forth/pcibios.4th rename to stand/forth/pcibios.4th diff --git a/sys/boot/forth/pnp.4th b/stand/forth/pnp.4th similarity index 98% rename from sys/boot/forth/pnp.4th rename to stand/forth/pnp.4th index 8be89d8277fe..4aa4bcf2ac21 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/common/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 similarity index 100% rename from sys/boot/forth/screen.4th rename to stand/forth/screen.4th diff --git a/sys/boot/forth/shortcuts.4th b/stand/forth/shortcuts.4th similarity index 100% rename from sys/boot/forth/shortcuts.4th rename to stand/forth/shortcuts.4th diff --git a/sys/boot/forth/support.4th b/stand/forth/support.4th similarity index 99% rename from sys/boot/forth/support.4th rename to stand/forth/support.4th index 7ce9e5289acf..aa50b3bb3a9d 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 similarity index 100% rename from sys/boot/forth/version.4th rename to stand/forth/version.4th diff --git a/sys/boot/forth/version.4th.8 b/stand/forth/version.4th.8 similarity index 100% rename from sys/boot/forth/version.4th.8 rename to stand/forth/version.4th.8 diff --git a/sys/boot/geli/Makefile b/stand/geli/Makefile similarity index 100% rename from sys/boot/geli/Makefile rename to stand/geli/Makefile diff --git a/sys/boot/geli/Makefile.depend b/stand/geli/Makefile.depend similarity index 100% rename from sys/boot/geli/Makefile.depend rename to stand/geli/Makefile.depend diff --git a/sys/boot/geli/geliboot.c b/stand/geli/geliboot.c similarity index 100% rename from sys/boot/geli/geliboot.c rename to stand/geli/geliboot.c diff --git a/sys/boot/geli/geliboot.h b/stand/geli/geliboot.h similarity index 100% rename from sys/boot/geli/geliboot.h rename to stand/geli/geliboot.h diff --git a/sys/boot/geli/geliboot_crypto.c b/stand/geli/geliboot_crypto.c similarity index 100% rename from sys/boot/geli/geliboot_crypto.c rename to stand/geli/geliboot_crypto.c diff --git a/sys/boot/geli/geliboot_internal.h b/stand/geli/geliboot_internal.h similarity index 100% rename from sys/boot/geli/geliboot_internal.h rename to stand/geli/geliboot_internal.h diff --git a/sys/boot/geli/pwgets.c b/stand/geli/pwgets.c similarity index 100% rename from sys/boot/geli/pwgets.c rename to stand/geli/pwgets.c diff --git a/sys/boot/i386/Makefile b/stand/i386/Makefile similarity index 100% rename from sys/boot/i386/Makefile rename to stand/i386/Makefile diff --git a/sys/boot/i386/Makefile.inc b/stand/i386/Makefile.inc similarity index 95% rename from sys/boot/i386/Makefile.inc rename to stand/i386/Makefile.inc index 5c36555f940c..54391c4d62c2 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 similarity index 100% rename from sys/boot/i386/boot.ldscript rename to stand/i386/boot.ldscript diff --git a/sys/boot/i386/boot0/Makefile b/stand/i386/boot0/Makefile similarity index 100% rename from sys/boot/i386/boot0/Makefile rename to stand/i386/boot0/Makefile diff --git a/sys/boot/i386/boot0/Makefile.depend b/stand/i386/boot0/Makefile.depend similarity index 100% rename from sys/boot/i386/boot0/Makefile.depend rename to stand/i386/boot0/Makefile.depend diff --git a/sys/boot/i386/boot0/boot0.S b/stand/i386/boot0/boot0.S similarity index 100% rename from sys/boot/i386/boot0/boot0.S rename to stand/i386/boot0/boot0.S diff --git a/sys/boot/i386/boot0sio/Makefile b/stand/i386/boot0sio/Makefile similarity index 100% rename from sys/boot/i386/boot0sio/Makefile rename to stand/i386/boot0sio/Makefile diff --git a/sys/boot/i386/boot0sio/Makefile.depend b/stand/i386/boot0sio/Makefile.depend similarity index 100% rename from sys/boot/i386/boot0sio/Makefile.depend rename to stand/i386/boot0sio/Makefile.depend diff --git a/sys/boot/i386/boot2/Makefile b/stand/i386/boot2/Makefile similarity index 100% rename from sys/boot/i386/boot2/Makefile rename to stand/i386/boot2/Makefile diff --git a/sys/boot/i386/boot2/Makefile.depend b/stand/i386/boot2/Makefile.depend similarity index 78% rename from sys/boot/i386/boot2/Makefile.depend rename to stand/i386/boot2/Makefile.depend index d5a67a6b2085..bc9b1b7bddc9 100644 --- a/sys/boot/i386/boot2/Makefile.depend +++ b/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 diff --git a/sys/boot/i386/boot2/boot1.S b/stand/i386/boot2/boot1.S similarity index 100% rename from sys/boot/i386/boot2/boot1.S rename to stand/i386/boot2/boot1.S diff --git a/sys/boot/i386/boot2/boot2.c b/stand/i386/boot2/boot2.c similarity index 100% rename from sys/boot/i386/boot2/boot2.c rename to stand/i386/boot2/boot2.c diff --git a/sys/boot/i386/boot2/lib.h b/stand/i386/boot2/lib.h similarity index 100% rename from sys/boot/i386/boot2/lib.h rename to stand/i386/boot2/lib.h diff --git a/sys/boot/i386/boot2/sio.S b/stand/i386/boot2/sio.S similarity index 100% rename from sys/boot/i386/boot2/sio.S rename to stand/i386/boot2/sio.S diff --git a/sys/boot/i386/btx/Makefile b/stand/i386/btx/Makefile similarity index 100% rename from sys/boot/i386/btx/Makefile rename to stand/i386/btx/Makefile diff --git a/sys/boot/i386/btx/Makefile.inc b/stand/i386/btx/Makefile.inc similarity index 100% rename from sys/boot/i386/btx/Makefile.inc rename to stand/i386/btx/Makefile.inc diff --git a/sys/boot/i386/btx/btx/Makefile b/stand/i386/btx/btx/Makefile similarity index 100% rename from sys/boot/i386/btx/btx/Makefile rename to stand/i386/btx/btx/Makefile diff --git a/sys/boot/i386/btx/btx/Makefile.depend b/stand/i386/btx/btx/Makefile.depend similarity index 100% rename from sys/boot/i386/btx/btx/Makefile.depend rename to stand/i386/btx/btx/Makefile.depend diff --git a/sys/boot/i386/btx/btx/btx.S b/stand/i386/btx/btx/btx.S similarity index 100% rename from sys/boot/i386/btx/btx/btx.S rename to stand/i386/btx/btx/btx.S diff --git a/sys/boot/i386/btx/btxldr/Makefile b/stand/i386/btx/btxldr/Makefile similarity index 100% rename from sys/boot/i386/btx/btxldr/Makefile rename to stand/i386/btx/btxldr/Makefile diff --git a/sys/boot/i386/btx/btxldr/Makefile.depend b/stand/i386/btx/btxldr/Makefile.depend similarity index 100% rename from sys/boot/i386/btx/btxldr/Makefile.depend rename to stand/i386/btx/btxldr/Makefile.depend diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/stand/i386/btx/btxldr/btxldr.S similarity index 100% rename from sys/boot/i386/btx/btxldr/btxldr.S rename to stand/i386/btx/btxldr/btxldr.S diff --git a/sys/boot/i386/btx/lib/Makefile b/stand/i386/btx/lib/Makefile similarity index 100% rename from sys/boot/i386/btx/lib/Makefile rename to stand/i386/btx/lib/Makefile diff --git a/sys/boot/i386/btx/lib/Makefile.depend b/stand/i386/btx/lib/Makefile.depend similarity index 100% rename from sys/boot/i386/btx/lib/Makefile.depend rename to stand/i386/btx/lib/Makefile.depend diff --git a/sys/boot/i386/btx/lib/btxcsu.S b/stand/i386/btx/lib/btxcsu.S similarity index 100% rename from sys/boot/i386/btx/lib/btxcsu.S rename to stand/i386/btx/lib/btxcsu.S diff --git a/sys/boot/i386/btx/lib/btxsys.s b/stand/i386/btx/lib/btxsys.s similarity index 100% rename from sys/boot/i386/btx/lib/btxsys.s rename to stand/i386/btx/lib/btxsys.s diff --git a/sys/boot/i386/btx/lib/btxv86.h b/stand/i386/btx/lib/btxv86.h similarity index 100% rename from sys/boot/i386/btx/lib/btxv86.h rename to stand/i386/btx/lib/btxv86.h diff --git a/sys/boot/i386/btx/lib/btxv86.s b/stand/i386/btx/lib/btxv86.s similarity index 100% rename from sys/boot/i386/btx/lib/btxv86.s rename to stand/i386/btx/lib/btxv86.s diff --git a/sys/boot/i386/cdboot/Makefile b/stand/i386/cdboot/Makefile similarity index 100% rename from sys/boot/i386/cdboot/Makefile rename to stand/i386/cdboot/Makefile diff --git a/sys/boot/i386/cdboot/Makefile.depend b/stand/i386/cdboot/Makefile.depend similarity index 100% rename from sys/boot/i386/cdboot/Makefile.depend rename to stand/i386/cdboot/Makefile.depend diff --git a/sys/boot/i386/cdboot/cdboot.S b/stand/i386/cdboot/cdboot.S similarity index 100% rename from sys/boot/i386/cdboot/cdboot.S rename to stand/i386/cdboot/cdboot.S diff --git a/sys/boot/i386/common/bootargs.h b/stand/i386/common/bootargs.h similarity index 100% rename from sys/boot/i386/common/bootargs.h rename to stand/i386/common/bootargs.h diff --git a/sys/boot/i386/common/cons.c b/stand/i386/common/cons.c similarity index 100% rename from sys/boot/i386/common/cons.c rename to stand/i386/common/cons.c diff --git a/sys/boot/i386/common/cons.h b/stand/i386/common/cons.h similarity index 100% rename from sys/boot/i386/common/cons.h rename to stand/i386/common/cons.h diff --git a/sys/boot/i386/common/drv.c b/stand/i386/common/drv.c similarity index 100% rename from sys/boot/i386/common/drv.c rename to stand/i386/common/drv.c diff --git a/sys/boot/i386/common/drv.h b/stand/i386/common/drv.h similarity index 100% rename from sys/boot/i386/common/drv.h rename to stand/i386/common/drv.h diff --git a/sys/boot/i386/common/edd.h b/stand/i386/common/edd.h similarity index 100% rename from sys/boot/i386/common/edd.h rename to stand/i386/common/edd.h diff --git a/sys/boot/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile similarity index 100% rename from sys/boot/i386/gptboot/Makefile rename to stand/i386/gptboot/Makefile diff --git a/sys/boot/i386/gptboot/Makefile.depend b/stand/i386/gptboot/Makefile.depend similarity index 71% rename from sys/boot/i386/gptboot/Makefile.depend rename to stand/i386/gptboot/Makefile.depend index c6ac7d89dda0..89aa3261d133 100644 --- a/sys/boot/i386/gptboot/Makefile.depend +++ b/stand/i386/gptboot/Makefile.depend @@ -5,10 +5,10 @@ DIRDEPS = \ include \ include/xlocale \ lib/libmd \ - sys/boot/geli \ - sys/boot/i386/btx/btx \ - sys/boot/i386/btx/lib \ - sys/boot/libsa32 \ + stand/geli \ + stand/i386/btx/btx \ + stand/i386/btx/lib \ + stand/libsa32 \ .include diff --git a/sys/boot/i386/gptboot/gptboot.8 b/stand/i386/gptboot/gptboot.8 similarity index 100% rename from sys/boot/i386/gptboot/gptboot.8 rename to stand/i386/gptboot/gptboot.8 diff --git a/sys/boot/i386/gptboot/gptboot.c b/stand/i386/gptboot/gptboot.c similarity index 100% rename from sys/boot/i386/gptboot/gptboot.c rename to stand/i386/gptboot/gptboot.c diff --git a/sys/boot/i386/gptboot/gptldr.S b/stand/i386/gptboot/gptldr.S similarity index 100% rename from sys/boot/i386/gptboot/gptldr.S rename to stand/i386/gptboot/gptldr.S diff --git a/sys/boot/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile similarity index 100% rename from sys/boot/i386/gptzfsboot/Makefile rename to stand/i386/gptzfsboot/Makefile diff --git a/sys/boot/i386/gptzfsboot/Makefile.depend b/stand/i386/gptzfsboot/Makefile.depend similarity index 67% rename from sys/boot/i386/gptzfsboot/Makefile.depend rename to stand/i386/gptzfsboot/Makefile.depend index 16b58a77a452..ce86c7a5535c 100644 --- a/sys/boot/i386/gptzfsboot/Makefile.depend +++ b/stand/i386/gptzfsboot/Makefile.depend @@ -5,11 +5,11 @@ DIRDEPS = \ include \ include/xlocale \ lib/libmd \ - sys/boot/geli \ - sys/boot/i386/btx/btx \ - sys/boot/i386/btx/lib \ - sys/boot/libsa32 \ - sys/boot/zfs32 \ + stand/geli \ + stand/i386/btx/btx \ + stand/i386/btx/lib \ + stand/libsa32 \ + stand/zfs32 \ .include diff --git a/sys/boot/i386/gptzfsboot/gptzfsboot.8 b/stand/i386/gptzfsboot/gptzfsboot.8 similarity index 100% rename from sys/boot/i386/gptzfsboot/gptzfsboot.8 rename to stand/i386/gptzfsboot/gptzfsboot.8 diff --git a/sys/boot/i386/kgzldr/Makefile b/stand/i386/kgzldr/Makefile similarity index 100% rename from sys/boot/i386/kgzldr/Makefile rename to stand/i386/kgzldr/Makefile diff --git a/sys/boot/i386/kgzldr/Makefile.depend b/stand/i386/kgzldr/Makefile.depend similarity index 100% rename from sys/boot/i386/kgzldr/Makefile.depend rename to stand/i386/kgzldr/Makefile.depend diff --git a/sys/boot/i386/kgzldr/boot.c b/stand/i386/kgzldr/boot.c similarity index 100% rename from sys/boot/i386/kgzldr/boot.c rename to stand/i386/kgzldr/boot.c diff --git a/sys/boot/i386/kgzldr/crt.s b/stand/i386/kgzldr/crt.s similarity index 100% rename from sys/boot/i386/kgzldr/crt.s rename to stand/i386/kgzldr/crt.s diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/stand/i386/kgzldr/kgzldr.h similarity index 100% rename from sys/boot/i386/kgzldr/kgzldr.h rename to stand/i386/kgzldr/kgzldr.h diff --git a/sys/boot/i386/kgzldr/lib.c b/stand/i386/kgzldr/lib.c similarity index 100% rename from sys/boot/i386/kgzldr/lib.c rename to stand/i386/kgzldr/lib.c diff --git a/sys/boot/i386/kgzldr/sio.s b/stand/i386/kgzldr/sio.s similarity index 100% rename from sys/boot/i386/kgzldr/sio.s rename to stand/i386/kgzldr/sio.s diff --git a/sys/boot/i386/kgzldr/start.s b/stand/i386/kgzldr/start.s similarity index 100% rename from sys/boot/i386/kgzldr/start.s rename to stand/i386/kgzldr/start.s diff --git a/sys/boot/i386/libfirewire/Makefile b/stand/i386/libfirewire/Makefile similarity index 100% rename from sys/boot/i386/libfirewire/Makefile rename to stand/i386/libfirewire/Makefile diff --git a/sys/boot/i386/libfirewire/Makefile.depend b/stand/i386/libfirewire/Makefile.depend similarity index 100% rename from sys/boot/i386/libfirewire/Makefile.depend rename to stand/i386/libfirewire/Makefile.depend diff --git a/sys/boot/i386/libfirewire/dconsole.c b/stand/i386/libfirewire/dconsole.c similarity index 100% rename from sys/boot/i386/libfirewire/dconsole.c rename to stand/i386/libfirewire/dconsole.c diff --git a/sys/boot/i386/libfirewire/firewire.c b/stand/i386/libfirewire/firewire.c similarity index 100% rename from sys/boot/i386/libfirewire/firewire.c rename to stand/i386/libfirewire/firewire.c diff --git a/sys/boot/i386/libfirewire/fwohci.c b/stand/i386/libfirewire/fwohci.c similarity index 100% rename from sys/boot/i386/libfirewire/fwohci.c rename to stand/i386/libfirewire/fwohci.c diff --git a/sys/boot/i386/libfirewire/fwohci.h b/stand/i386/libfirewire/fwohci.h similarity index 100% rename from sys/boot/i386/libfirewire/fwohci.h rename to stand/i386/libfirewire/fwohci.h diff --git a/sys/boot/i386/libfirewire/fwohcireg.h b/stand/i386/libfirewire/fwohcireg.h similarity index 100% rename from sys/boot/i386/libfirewire/fwohcireg.h rename to stand/i386/libfirewire/fwohcireg.h diff --git a/sys/boot/i386/libi386/Makefile b/stand/i386/libi386/Makefile similarity index 100% rename from sys/boot/i386/libi386/Makefile rename to stand/i386/libi386/Makefile diff --git a/sys/boot/i386/libi386/Makefile.depend b/stand/i386/libi386/Makefile.depend similarity index 100% rename from sys/boot/i386/libi386/Makefile.depend rename to stand/i386/libi386/Makefile.depend diff --git a/sys/boot/i386/libi386/amd64_tramp.S b/stand/i386/libi386/amd64_tramp.S similarity index 100% rename from sys/boot/i386/libi386/amd64_tramp.S rename to stand/i386/libi386/amd64_tramp.S diff --git a/sys/boot/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c similarity index 100% rename from sys/boot/i386/libi386/biosacpi.c rename to stand/i386/libi386/biosacpi.c diff --git a/sys/boot/i386/libi386/bioscd.c b/stand/i386/libi386/bioscd.c similarity index 100% rename from sys/boot/i386/libi386/bioscd.c rename to stand/i386/libi386/bioscd.c diff --git a/sys/boot/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c similarity index 100% rename from sys/boot/i386/libi386/biosdisk.c rename to stand/i386/libi386/biosdisk.c diff --git a/sys/boot/i386/libi386/biosmem.c b/stand/i386/libi386/biosmem.c similarity index 100% rename from sys/boot/i386/libi386/biosmem.c rename to stand/i386/libi386/biosmem.c diff --git a/sys/boot/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c similarity index 100% rename from sys/boot/i386/libi386/biospci.c rename to stand/i386/libi386/biospci.c diff --git a/sys/boot/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c similarity index 100% rename from sys/boot/i386/libi386/biospnp.c rename to stand/i386/libi386/biospnp.c diff --git a/sys/boot/i386/libi386/biossmap.c b/stand/i386/libi386/biossmap.c similarity index 100% rename from sys/boot/i386/libi386/biossmap.c rename to stand/i386/libi386/biossmap.c diff --git a/sys/boot/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c similarity index 100% rename from sys/boot/i386/libi386/bootinfo.c rename to stand/i386/libi386/bootinfo.c diff --git a/sys/boot/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c similarity index 100% rename from sys/boot/i386/libi386/bootinfo32.c rename to stand/i386/libi386/bootinfo32.c diff --git a/sys/boot/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c similarity index 100% rename from sys/boot/i386/libi386/bootinfo64.c rename to stand/i386/libi386/bootinfo64.c diff --git a/sys/boot/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c similarity index 100% rename from sys/boot/i386/libi386/comconsole.c rename to stand/i386/libi386/comconsole.c diff --git a/sys/boot/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c similarity index 100% rename from sys/boot/i386/libi386/devicename.c rename to stand/i386/libi386/devicename.c diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/stand/i386/libi386/elf32_freebsd.c similarity index 100% rename from sys/boot/i386/libi386/elf32_freebsd.c rename to stand/i386/libi386/elf32_freebsd.c diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c similarity index 100% rename from sys/boot/i386/libi386/elf64_freebsd.c rename to stand/i386/libi386/elf64_freebsd.c diff --git a/sys/boot/i386/libi386/i386_copy.c b/stand/i386/libi386/i386_copy.c similarity index 100% rename from sys/boot/i386/libi386/i386_copy.c rename to stand/i386/libi386/i386_copy.c diff --git a/sys/boot/i386/libi386/i386_module.c b/stand/i386/libi386/i386_module.c similarity index 100% rename from sys/boot/i386/libi386/i386_module.c rename to stand/i386/libi386/i386_module.c diff --git a/sys/boot/i386/libi386/libi386.h b/stand/i386/libi386/libi386.h similarity index 100% rename from sys/boot/i386/libi386/libi386.h rename to stand/i386/libi386/libi386.h diff --git a/sys/boot/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c similarity index 100% rename from sys/boot/i386/libi386/multiboot.c rename to stand/i386/libi386/multiboot.c diff --git a/sys/boot/i386/libi386/multiboot.h b/stand/i386/libi386/multiboot.h similarity index 100% rename from sys/boot/i386/libi386/multiboot.h rename to stand/i386/libi386/multiboot.h diff --git a/sys/boot/i386/libi386/multiboot_tramp.S b/stand/i386/libi386/multiboot_tramp.S similarity index 100% rename from sys/boot/i386/libi386/multiboot_tramp.S rename to stand/i386/libi386/multiboot_tramp.S diff --git a/sys/boot/i386/libi386/nullconsole.c b/stand/i386/libi386/nullconsole.c similarity index 100% rename from sys/boot/i386/libi386/nullconsole.c rename to stand/i386/libi386/nullconsole.c diff --git a/sys/boot/i386/libi386/pread.c b/stand/i386/libi386/pread.c similarity index 100% rename from sys/boot/i386/libi386/pread.c rename to stand/i386/libi386/pread.c diff --git a/sys/boot/i386/libi386/pxe.c b/stand/i386/libi386/pxe.c similarity index 100% rename from sys/boot/i386/libi386/pxe.c rename to stand/i386/libi386/pxe.c diff --git a/sys/boot/i386/libi386/pxe.h b/stand/i386/libi386/pxe.h similarity index 100% rename from sys/boot/i386/libi386/pxe.h rename to stand/i386/libi386/pxe.h diff --git a/sys/boot/i386/libi386/pxetramp.s b/stand/i386/libi386/pxetramp.s similarity index 100% rename from sys/boot/i386/libi386/pxetramp.s rename to stand/i386/libi386/pxetramp.s diff --git a/sys/boot/i386/libi386/relocater_tramp.S b/stand/i386/libi386/relocater_tramp.S similarity index 100% rename from sys/boot/i386/libi386/relocater_tramp.S rename to stand/i386/libi386/relocater_tramp.S diff --git a/sys/boot/i386/libi386/smbios.c b/stand/i386/libi386/smbios.c similarity index 100% rename from sys/boot/i386/libi386/smbios.c rename to stand/i386/libi386/smbios.c diff --git a/sys/boot/i386/libi386/smbios.h b/stand/i386/libi386/smbios.h similarity index 100% rename from sys/boot/i386/libi386/smbios.h rename to stand/i386/libi386/smbios.h diff --git a/sys/boot/i386/libi386/spinconsole.c b/stand/i386/libi386/spinconsole.c similarity index 100% rename from sys/boot/i386/libi386/spinconsole.c rename to stand/i386/libi386/spinconsole.c diff --git a/sys/boot/i386/libi386/time.c b/stand/i386/libi386/time.c similarity index 100% rename from sys/boot/i386/libi386/time.c rename to stand/i386/libi386/time.c diff --git a/sys/boot/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c similarity index 100% rename from sys/boot/i386/libi386/vidconsole.c rename to stand/i386/libi386/vidconsole.c diff --git a/sys/boot/i386/loader/Makefile b/stand/i386/loader/Makefile similarity index 100% rename from sys/boot/i386/loader/Makefile rename to stand/i386/loader/Makefile diff --git a/stand/i386/loader/Makefile.depend b/stand/i386/loader/Makefile.depend new file mode 100644 index 000000000000..05739faa951d --- /dev/null +++ b/stand/i386/loader/Makefile.depend @@ -0,0 +1,20 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + stand/ficl32 \ + stand/geli \ + stand/i386/btx/btx \ + stand/i386/btx/btxldr \ + stand/i386/btx/lib \ + stand/i386/libi386 \ + stand/libsa32 \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/sys/boot/i386/loader/chain.c b/stand/i386/loader/chain.c similarity index 100% rename from sys/boot/i386/loader/chain.c rename to stand/i386/loader/chain.c diff --git a/sys/boot/i386/loader/conf.c b/stand/i386/loader/conf.c similarity index 100% rename from sys/boot/i386/loader/conf.c rename to stand/i386/loader/conf.c diff --git a/sys/boot/i386/loader/help.i386 b/stand/i386/loader/help.i386 similarity index 100% rename from sys/boot/i386/loader/help.i386 rename to stand/i386/loader/help.i386 diff --git a/sys/boot/i386/loader/loader.rc b/stand/i386/loader/loader.rc similarity index 100% rename from sys/boot/i386/loader/loader.rc rename to stand/i386/loader/loader.rc diff --git a/sys/boot/i386/loader/main.c b/stand/i386/loader/main.c similarity index 100% rename from sys/boot/i386/loader/main.c rename to stand/i386/loader/main.c diff --git a/sys/boot/i386/loader/version b/stand/i386/loader/version similarity index 100% rename from sys/boot/i386/loader/version rename to stand/i386/loader/version diff --git a/sys/boot/i386/mbr/Makefile b/stand/i386/mbr/Makefile similarity index 100% rename from sys/boot/i386/mbr/Makefile rename to stand/i386/mbr/Makefile diff --git a/sys/boot/i386/mbr/Makefile.depend b/stand/i386/mbr/Makefile.depend similarity index 100% rename from sys/boot/i386/mbr/Makefile.depend rename to stand/i386/mbr/Makefile.depend diff --git a/sys/boot/i386/mbr/mbr.s b/stand/i386/mbr/mbr.s similarity index 100% rename from sys/boot/i386/mbr/mbr.s rename to stand/i386/mbr/mbr.s diff --git a/sys/boot/i386/pmbr/Makefile b/stand/i386/pmbr/Makefile similarity index 100% rename from sys/boot/i386/pmbr/Makefile rename to stand/i386/pmbr/Makefile diff --git a/sys/boot/i386/pmbr/Makefile.depend b/stand/i386/pmbr/Makefile.depend similarity index 100% rename from sys/boot/i386/pmbr/Makefile.depend rename to stand/i386/pmbr/Makefile.depend diff --git a/sys/boot/i386/pmbr/pmbr.s b/stand/i386/pmbr/pmbr.s similarity index 100% rename from sys/boot/i386/pmbr/pmbr.s rename to stand/i386/pmbr/pmbr.s diff --git a/sys/boot/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile similarity index 100% rename from sys/boot/i386/pxeldr/Makefile rename to stand/i386/pxeldr/Makefile diff --git a/sys/boot/i386/pxeldr/Makefile.depend b/stand/i386/pxeldr/Makefile.depend similarity index 70% rename from sys/boot/i386/pxeldr/Makefile.depend rename to stand/i386/pxeldr/Makefile.depend index c6f574a284a3..35b75b1ca42b 100644 --- a/sys/boot/i386/pxeldr/Makefile.depend +++ b/stand/i386/pxeldr/Makefile.depend @@ -3,9 +3,9 @@ DIRDEPS = \ include \ - sys/boot/i386/btx/btx \ - sys/boot/i386/btx/btxldr \ - sys/boot/i386/loader \ + stand/i386/btx/btx \ + stand/i386/btx/btxldr \ + stand/i386/loader \ .include diff --git a/sys/boot/i386/pxeldr/pxeboot.8 b/stand/i386/pxeldr/pxeboot.8 similarity index 100% rename from sys/boot/i386/pxeldr/pxeboot.8 rename to stand/i386/pxeldr/pxeboot.8 diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/stand/i386/pxeldr/pxeldr.S similarity index 100% rename from sys/boot/i386/pxeldr/pxeldr.S rename to stand/i386/pxeldr/pxeldr.S diff --git a/sys/boot/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile similarity index 100% rename from sys/boot/i386/zfsboot/Makefile rename to stand/i386/zfsboot/Makefile diff --git a/sys/boot/i386/zfsboot/Makefile.depend b/stand/i386/zfsboot/Makefile.depend similarity index 71% rename from sys/boot/i386/zfsboot/Makefile.depend rename to stand/i386/zfsboot/Makefile.depend index 491ced5bb565..58b2754996b4 100644 --- a/sys/boot/i386/zfsboot/Makefile.depend +++ b/stand/i386/zfsboot/Makefile.depend @@ -5,10 +5,10 @@ DIRDEPS = \ include \ include/xlocale \ lib/libmd \ - sys/boot/i386/btx/btx \ - sys/boot/i386/btx/lib \ - sys/boot/libsa32 \ - sys/boot/zfs32 \ + stand/i386/btx/btx \ + stand/i386/btx/lib \ + stand/libsa32 \ + stand/zfs32 \ .include diff --git a/sys/boot/i386/zfsboot/zfsboot.8 b/stand/i386/zfsboot/zfsboot.8 similarity index 100% rename from sys/boot/i386/zfsboot/zfsboot.8 rename to stand/i386/zfsboot/zfsboot.8 diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c similarity index 100% rename from sys/boot/i386/zfsboot/zfsboot.c rename to stand/i386/zfsboot/zfsboot.c diff --git a/sys/boot/i386/zfsboot/zfsldr.S b/stand/i386/zfsboot/zfsldr.S similarity index 100% rename from sys/boot/i386/zfsboot/zfsldr.S rename to stand/i386/zfsboot/zfsldr.S diff --git a/sys/boot/i386/zfsloader/Makefile b/stand/i386/zfsloader/Makefile similarity index 100% rename from sys/boot/i386/zfsloader/Makefile rename to stand/i386/zfsloader/Makefile diff --git a/stand/i386/zfsloader/Makefile.depend b/stand/i386/zfsloader/Makefile.depend new file mode 100644 index 000000000000..59ee8748092a --- /dev/null +++ b/stand/i386/zfsloader/Makefile.depend @@ -0,0 +1,21 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + include \ + include/xlocale \ + stand/ficl32 \ + stand/geli \ + stand/i386/btx/btx \ + stand/i386/btx/btxldr \ + stand/i386/btx/lib \ + stand/i386/libi386 \ + stand/libsa32 \ + stand/zfs32 \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/sys/boot/kshim/bsd_busspace.c b/stand/kshim/bsd_busspace.c similarity index 100% rename from sys/boot/kshim/bsd_busspace.c rename to stand/kshim/bsd_busspace.c diff --git a/sys/boot/kshim/bsd_global.h b/stand/kshim/bsd_global.h similarity index 100% rename from sys/boot/kshim/bsd_global.h rename to stand/kshim/bsd_global.h diff --git a/sys/boot/kshim/bsd_kernel.c b/stand/kshim/bsd_kernel.c similarity index 100% rename from sys/boot/kshim/bsd_kernel.c rename to stand/kshim/bsd_kernel.c diff --git a/sys/boot/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h similarity index 100% rename from sys/boot/kshim/bsd_kernel.h rename to stand/kshim/bsd_kernel.h diff --git a/sys/boot/kshim/kshim.mk b/stand/kshim/kshim.mk similarity index 100% rename from sys/boot/kshim/kshim.mk rename to stand/kshim/kshim.mk diff --git a/sys/boot/kshim/sysinit.h b/stand/kshim/sysinit.h similarity index 100% rename from sys/boot/kshim/sysinit.h rename to stand/kshim/sysinit.h diff --git a/sys/boot/libsa/Makefile b/stand/libsa/Makefile similarity index 100% rename from sys/boot/libsa/Makefile rename to stand/libsa/Makefile diff --git a/sys/boot/libsa/Makefile.depend b/stand/libsa/Makefile.depend similarity index 100% rename from sys/boot/libsa/Makefile.depend rename to stand/libsa/Makefile.depend diff --git a/sys/boot/libsa/__main.c b/stand/libsa/__main.c similarity index 100% rename from sys/boot/libsa/__main.c rename to stand/libsa/__main.c diff --git a/sys/boot/libsa/amd64/_setjmp.S b/stand/libsa/amd64/_setjmp.S similarity index 100% rename from sys/boot/libsa/amd64/_setjmp.S rename to stand/libsa/amd64/_setjmp.S diff --git a/sys/boot/libsa/arp.c b/stand/libsa/arp.c similarity index 100% rename from sys/boot/libsa/arp.c rename to stand/libsa/arp.c diff --git a/sys/boot/libsa/assert.c b/stand/libsa/assert.c similarity index 100% rename from sys/boot/libsa/assert.c rename to stand/libsa/assert.c diff --git a/sys/boot/libsa/bcd.c b/stand/libsa/bcd.c similarity index 100% rename from sys/boot/libsa/bcd.c rename to stand/libsa/bcd.c diff --git a/sys/boot/libsa/bootp.c b/stand/libsa/bootp.c similarity index 100% rename from sys/boot/libsa/bootp.c rename to stand/libsa/bootp.c diff --git a/sys/boot/libsa/bootp.h b/stand/libsa/bootp.h similarity index 100% rename from sys/boot/libsa/bootp.h rename to stand/libsa/bootp.h diff --git a/sys/boot/libsa/bootparam.c b/stand/libsa/bootparam.c similarity index 100% rename from sys/boot/libsa/bootparam.c rename to stand/libsa/bootparam.c diff --git a/sys/boot/libsa/bootparam.h b/stand/libsa/bootparam.h similarity index 100% rename from sys/boot/libsa/bootparam.h rename to stand/libsa/bootparam.h diff --git a/sys/boot/libsa/bzipfs.c b/stand/libsa/bzipfs.c similarity index 100% rename from sys/boot/libsa/bzipfs.c rename to stand/libsa/bzipfs.c diff --git a/sys/boot/libsa/cd9660.c b/stand/libsa/cd9660.c similarity index 100% rename from sys/boot/libsa/cd9660.c rename to stand/libsa/cd9660.c diff --git a/sys/boot/libsa/close.c b/stand/libsa/close.c similarity index 100% rename from sys/boot/libsa/close.c rename to stand/libsa/close.c diff --git a/sys/boot/libsa/closeall.c b/stand/libsa/closeall.c similarity index 100% rename from sys/boot/libsa/closeall.c rename to stand/libsa/closeall.c diff --git a/sys/boot/libsa/crc32.c b/stand/libsa/crc32.c similarity index 100% rename from sys/boot/libsa/crc32.c rename to stand/libsa/crc32.c diff --git a/sys/boot/libsa/crc32.h b/stand/libsa/crc32.h similarity index 100% rename from sys/boot/libsa/crc32.h rename to stand/libsa/crc32.h diff --git a/sys/boot/libsa/dev.c b/stand/libsa/dev.c similarity index 100% rename from sys/boot/libsa/dev.c rename to stand/libsa/dev.c diff --git a/sys/boot/libsa/dosfs.c b/stand/libsa/dosfs.c similarity index 100% rename from sys/boot/libsa/dosfs.c rename to stand/libsa/dosfs.c diff --git a/sys/boot/libsa/dosfs.h b/stand/libsa/dosfs.h similarity index 100% rename from sys/boot/libsa/dosfs.h rename to stand/libsa/dosfs.h diff --git a/sys/boot/libsa/environment.c b/stand/libsa/environment.c similarity index 100% rename from sys/boot/libsa/environment.c rename to stand/libsa/environment.c diff --git a/sys/boot/libsa/ether.c b/stand/libsa/ether.c similarity index 100% rename from sys/boot/libsa/ether.c rename to stand/libsa/ether.c diff --git a/sys/boot/libsa/ext2fs.c b/stand/libsa/ext2fs.c similarity index 100% rename from sys/boot/libsa/ext2fs.c rename to stand/libsa/ext2fs.c diff --git a/sys/boot/libsa/fstat.c b/stand/libsa/fstat.c similarity index 100% rename from sys/boot/libsa/fstat.c rename to stand/libsa/fstat.c diff --git a/sys/boot/libsa/getopt.c b/stand/libsa/getopt.c similarity index 100% rename from sys/boot/libsa/getopt.c rename to stand/libsa/getopt.c diff --git a/sys/boot/libsa/gets.c b/stand/libsa/gets.c similarity index 100% rename from sys/boot/libsa/gets.c rename to stand/libsa/gets.c diff --git a/sys/boot/libsa/globals.c b/stand/libsa/globals.c similarity index 100% rename from sys/boot/libsa/globals.c rename to stand/libsa/globals.c diff --git a/sys/boot/libsa/gpt.c b/stand/libsa/gpt.c similarity index 100% rename from sys/boot/libsa/gpt.c rename to stand/libsa/gpt.c diff --git a/sys/boot/libsa/gpt.h b/stand/libsa/gpt.h similarity index 100% rename from sys/boot/libsa/gpt.h rename to stand/libsa/gpt.h diff --git a/sys/boot/libsa/gzipfs.c b/stand/libsa/gzipfs.c similarity index 100% rename from sys/boot/libsa/gzipfs.c rename to stand/libsa/gzipfs.c diff --git a/sys/boot/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S similarity index 100% rename from sys/boot/libsa/i386/_setjmp.S rename to stand/libsa/i386/_setjmp.S diff --git a/sys/boot/libsa/in_cksum.c b/stand/libsa/in_cksum.c similarity index 100% rename from sys/boot/libsa/in_cksum.c rename to stand/libsa/in_cksum.c diff --git a/sys/boot/libsa/inet_ntoa.c b/stand/libsa/inet_ntoa.c similarity index 100% rename from sys/boot/libsa/inet_ntoa.c rename to stand/libsa/inet_ntoa.c diff --git a/sys/boot/libsa/ioctl.c b/stand/libsa/ioctl.c similarity index 100% rename from sys/boot/libsa/ioctl.c rename to stand/libsa/ioctl.c diff --git a/sys/boot/libsa/iodesc.h b/stand/libsa/iodesc.h similarity index 100% rename from sys/boot/libsa/iodesc.h rename to stand/libsa/iodesc.h diff --git a/sys/boot/libsa/ip.c b/stand/libsa/ip.c similarity index 100% rename from sys/boot/libsa/ip.c rename to stand/libsa/ip.c diff --git a/sys/boot/libsa/libstand.3 b/stand/libsa/libstand.3 similarity index 100% rename from sys/boot/libsa/libstand.3 rename to stand/libsa/libstand.3 diff --git a/sys/boot/libsa/lseek.c b/stand/libsa/lseek.c similarity index 100% rename from sys/boot/libsa/lseek.c rename to stand/libsa/lseek.c diff --git a/sys/boot/libsa/mips/_setjmp.S b/stand/libsa/mips/_setjmp.S similarity index 100% rename from sys/boot/libsa/mips/_setjmp.S rename to stand/libsa/mips/_setjmp.S diff --git a/sys/boot/libsa/nandfs.c b/stand/libsa/nandfs.c similarity index 100% rename from sys/boot/libsa/nandfs.c rename to stand/libsa/nandfs.c diff --git a/sys/boot/libsa/net.c b/stand/libsa/net.c similarity index 100% rename from sys/boot/libsa/net.c rename to stand/libsa/net.c diff --git a/sys/boot/libsa/net.h b/stand/libsa/net.h similarity index 100% rename from sys/boot/libsa/net.h rename to stand/libsa/net.h diff --git a/sys/boot/libsa/netif.c b/stand/libsa/netif.c similarity index 100% rename from sys/boot/libsa/netif.c rename to stand/libsa/netif.c diff --git a/sys/boot/libsa/netif.h b/stand/libsa/netif.h similarity index 100% rename from sys/boot/libsa/netif.h rename to stand/libsa/netif.h diff --git a/sys/boot/libsa/nfs.c b/stand/libsa/nfs.c similarity index 100% rename from sys/boot/libsa/nfs.c rename to stand/libsa/nfs.c diff --git a/sys/boot/libsa/nfsv2.h b/stand/libsa/nfsv2.h similarity index 100% rename from sys/boot/libsa/nfsv2.h rename to stand/libsa/nfsv2.h diff --git a/sys/boot/libsa/nullfs.c b/stand/libsa/nullfs.c similarity index 100% rename from sys/boot/libsa/nullfs.c rename to stand/libsa/nullfs.c diff --git a/sys/boot/libsa/open.c b/stand/libsa/open.c similarity index 100% rename from sys/boot/libsa/open.c rename to stand/libsa/open.c diff --git a/sys/boot/libsa/pager.c b/stand/libsa/pager.c similarity index 100% rename from sys/boot/libsa/pager.c rename to stand/libsa/pager.c diff --git a/sys/boot/libsa/panic.c b/stand/libsa/panic.c similarity index 100% rename from sys/boot/libsa/panic.c rename to stand/libsa/panic.c diff --git a/sys/boot/libsa/pkgfs.c b/stand/libsa/pkgfs.c similarity index 100% rename from sys/boot/libsa/pkgfs.c rename to stand/libsa/pkgfs.c diff --git a/sys/boot/libsa/powerpc/_setjmp.S b/stand/libsa/powerpc/_setjmp.S similarity index 100% rename from sys/boot/libsa/powerpc/_setjmp.S rename to stand/libsa/powerpc/_setjmp.S diff --git a/sys/boot/libsa/powerpc/syncicache.c b/stand/libsa/powerpc/syncicache.c similarity index 100% rename from sys/boot/libsa/powerpc/syncicache.c rename to stand/libsa/powerpc/syncicache.c diff --git a/sys/boot/libsa/printf.c b/stand/libsa/printf.c similarity index 100% rename from sys/boot/libsa/printf.c rename to stand/libsa/printf.c diff --git a/sys/boot/libsa/qdivrem.c b/stand/libsa/qdivrem.c similarity index 100% rename from sys/boot/libsa/qdivrem.c rename to stand/libsa/qdivrem.c diff --git a/sys/boot/libsa/quad.h b/stand/libsa/quad.h similarity index 100% rename from sys/boot/libsa/quad.h rename to stand/libsa/quad.h diff --git a/sys/boot/libsa/random.c b/stand/libsa/random.c similarity index 100% rename from sys/boot/libsa/random.c rename to stand/libsa/random.c diff --git a/sys/boot/libsa/rarp.c b/stand/libsa/rarp.c similarity index 100% rename from sys/boot/libsa/rarp.c rename to stand/libsa/rarp.c diff --git a/sys/boot/libsa/read.c b/stand/libsa/read.c similarity index 100% rename from sys/boot/libsa/read.c rename to stand/libsa/read.c diff --git a/sys/boot/libsa/readdir.c b/stand/libsa/readdir.c similarity index 100% rename from sys/boot/libsa/readdir.c rename to stand/libsa/readdir.c diff --git a/sys/boot/libsa/rpc.c b/stand/libsa/rpc.c similarity index 100% rename from sys/boot/libsa/rpc.c rename to stand/libsa/rpc.c diff --git a/sys/boot/libsa/rpc.h b/stand/libsa/rpc.h similarity index 100% rename from sys/boot/libsa/rpc.h rename to stand/libsa/rpc.h diff --git a/sys/boot/libsa/rpcv2.h b/stand/libsa/rpcv2.h similarity index 100% rename from sys/boot/libsa/rpcv2.h rename to stand/libsa/rpcv2.h diff --git a/sys/boot/libsa/saioctl.h b/stand/libsa/saioctl.h similarity index 100% rename from sys/boot/libsa/saioctl.h rename to stand/libsa/saioctl.h diff --git a/sys/boot/libsa/sbrk.c b/stand/libsa/sbrk.c similarity index 100% rename from sys/boot/libsa/sbrk.c rename to stand/libsa/sbrk.c diff --git a/sys/boot/libsa/sparc64/_setjmp.S b/stand/libsa/sparc64/_setjmp.S similarity index 100% rename from sys/boot/libsa/sparc64/_setjmp.S rename to stand/libsa/sparc64/_setjmp.S diff --git a/sys/boot/libsa/splitfs.c b/stand/libsa/splitfs.c similarity index 100% rename from sys/boot/libsa/splitfs.c rename to stand/libsa/splitfs.c diff --git a/sys/boot/libsa/stand.h b/stand/libsa/stand.h similarity index 100% rename from sys/boot/libsa/stand.h rename to stand/libsa/stand.h diff --git a/sys/boot/libsa/stat.c b/stand/libsa/stat.c similarity index 100% rename from sys/boot/libsa/stat.c rename to stand/libsa/stat.c diff --git a/sys/boot/libsa/strcasecmp.c b/stand/libsa/strcasecmp.c similarity index 100% rename from sys/boot/libsa/strcasecmp.c rename to stand/libsa/strcasecmp.c diff --git a/sys/boot/libsa/strdup.c b/stand/libsa/strdup.c similarity index 100% rename from sys/boot/libsa/strdup.c rename to stand/libsa/strdup.c diff --git a/sys/boot/libsa/strerror.c b/stand/libsa/strerror.c similarity index 100% rename from sys/boot/libsa/strerror.c rename to stand/libsa/strerror.c diff --git a/sys/boot/libsa/strtol.c b/stand/libsa/strtol.c similarity index 100% rename from sys/boot/libsa/strtol.c rename to stand/libsa/strtol.c diff --git a/sys/boot/libsa/strtoul.c b/stand/libsa/strtoul.c similarity index 100% rename from sys/boot/libsa/strtoul.c rename to stand/libsa/strtoul.c diff --git a/sys/boot/libsa/tftp.c b/stand/libsa/tftp.c similarity index 100% rename from sys/boot/libsa/tftp.c rename to stand/libsa/tftp.c diff --git a/sys/boot/libsa/tftp.h b/stand/libsa/tftp.h similarity index 100% rename from sys/boot/libsa/tftp.h rename to stand/libsa/tftp.h diff --git a/sys/boot/libsa/twiddle.c b/stand/libsa/twiddle.c similarity index 100% rename from sys/boot/libsa/twiddle.c rename to stand/libsa/twiddle.c diff --git a/sys/boot/libsa/udp.c b/stand/libsa/udp.c similarity index 100% rename from sys/boot/libsa/udp.c rename to stand/libsa/udp.c diff --git a/sys/boot/libsa/ufs.c b/stand/libsa/ufs.c similarity index 100% rename from sys/boot/libsa/ufs.c rename to stand/libsa/ufs.c diff --git a/sys/boot/libsa/ufsread.c b/stand/libsa/ufsread.c similarity index 100% rename from sys/boot/libsa/ufsread.c rename to stand/libsa/ufsread.c diff --git a/sys/boot/libsa/util.c b/stand/libsa/util.c similarity index 100% rename from sys/boot/libsa/util.c rename to stand/libsa/util.c diff --git a/sys/boot/libsa/util.h b/stand/libsa/util.h similarity index 100% rename from sys/boot/libsa/util.h rename to stand/libsa/util.h diff --git a/sys/boot/libsa/uuid_from_string.c b/stand/libsa/uuid_from_string.c similarity index 100% rename from sys/boot/libsa/uuid_from_string.c rename to stand/libsa/uuid_from_string.c diff --git a/sys/boot/libsa/uuid_to_string.c b/stand/libsa/uuid_to_string.c similarity index 100% rename from sys/boot/libsa/uuid_to_string.c rename to stand/libsa/uuid_to_string.c diff --git a/sys/boot/libsa/write.c b/stand/libsa/write.c similarity index 100% rename from sys/boot/libsa/write.c rename to stand/libsa/write.c diff --git a/sys/boot/libsa/zalloc.c b/stand/libsa/zalloc.c similarity index 100% rename from sys/boot/libsa/zalloc.c rename to stand/libsa/zalloc.c diff --git a/sys/boot/libsa/zalloc_defs.h b/stand/libsa/zalloc_defs.h similarity index 100% rename from sys/boot/libsa/zalloc_defs.h rename to stand/libsa/zalloc_defs.h diff --git a/sys/boot/libsa/zalloc_malloc.c b/stand/libsa/zalloc_malloc.c similarity index 100% rename from sys/boot/libsa/zalloc_malloc.c rename to stand/libsa/zalloc_malloc.c diff --git a/sys/boot/libsa/zalloc_mem.h b/stand/libsa/zalloc_mem.h similarity index 100% rename from sys/boot/libsa/zalloc_mem.h rename to stand/libsa/zalloc_mem.h diff --git a/sys/boot/libsa/zalloc_protos.h b/stand/libsa/zalloc_protos.h similarity index 100% rename from sys/boot/libsa/zalloc_protos.h rename to stand/libsa/zalloc_protos.h diff --git a/sys/boot/libsa32/Makefile b/stand/libsa32/Makefile similarity index 100% rename from sys/boot/libsa32/Makefile rename to stand/libsa32/Makefile diff --git a/sys/boot/libsa32/Makefile.depend b/stand/libsa32/Makefile.depend similarity index 100% rename from sys/boot/libsa32/Makefile.depend rename to stand/libsa32/Makefile.depend diff --git a/sys/boot/loader.mk b/stand/loader.mk similarity index 100% rename from sys/boot/loader.mk rename to stand/loader.mk diff --git a/sys/boot/man/Makefile b/stand/man/Makefile similarity index 100% rename from sys/boot/man/Makefile rename to stand/man/Makefile diff --git a/sys/boot/man/Makefile.depend b/stand/man/Makefile.depend similarity index 100% rename from sys/boot/man/Makefile.depend rename to stand/man/Makefile.depend diff --git a/sys/boot/man/loader.8 b/stand/man/loader.8 similarity index 100% rename from sys/boot/man/loader.8 rename to stand/man/loader.8 diff --git a/sys/boot/man/zfsloader.8 b/stand/man/zfsloader.8 similarity index 100% rename from sys/boot/man/zfsloader.8 rename to stand/man/zfsloader.8 diff --git a/sys/boot/mips/Makefile b/stand/mips/Makefile similarity index 100% rename from sys/boot/mips/Makefile rename to stand/mips/Makefile diff --git a/sys/boot/mips/Makefile.inc b/stand/mips/Makefile.inc similarity index 100% rename from sys/boot/mips/Makefile.inc rename to stand/mips/Makefile.inc diff --git a/sys/boot/mips/beri/Makefile b/stand/mips/beri/Makefile similarity index 100% rename from sys/boot/mips/beri/Makefile rename to stand/mips/beri/Makefile diff --git a/sys/boot/mips/beri/Makefile.inc b/stand/mips/beri/Makefile.inc similarity index 100% rename from sys/boot/mips/beri/Makefile.inc rename to stand/mips/beri/Makefile.inc diff --git a/sys/boot/mips/beri/boot2/Makefile b/stand/mips/beri/boot2/Makefile similarity index 100% rename from sys/boot/mips/beri/boot2/Makefile rename to stand/mips/beri/boot2/Makefile diff --git a/sys/boot/mips/beri/boot2/boot2.c b/stand/mips/beri/boot2/boot2.c similarity index 100% rename from sys/boot/mips/beri/boot2/boot2.c rename to stand/mips/beri/boot2/boot2.c diff --git a/sys/boot/mips/beri/boot2/flashboot.ldscript b/stand/mips/beri/boot2/flashboot.ldscript similarity index 100% rename from sys/boot/mips/beri/boot2/flashboot.ldscript rename to stand/mips/beri/boot2/flashboot.ldscript diff --git a/sys/boot/mips/beri/boot2/jtagboot.ldscript b/stand/mips/beri/boot2/jtagboot.ldscript similarity index 100% rename from sys/boot/mips/beri/boot2/jtagboot.ldscript rename to stand/mips/beri/boot2/jtagboot.ldscript diff --git a/sys/boot/mips/beri/boot2/relocate.S b/stand/mips/beri/boot2/relocate.S similarity index 100% rename from sys/boot/mips/beri/boot2/relocate.S rename to stand/mips/beri/boot2/relocate.S diff --git a/sys/boot/mips/beri/boot2/start.S b/stand/mips/beri/boot2/start.S similarity index 100% rename from sys/boot/mips/beri/boot2/start.S rename to 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 similarity index 100% rename from sys/boot/mips/beri/common/altera_jtag_uart.c rename to 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 similarity index 100% rename from sys/boot/mips/beri/common/beri.h rename to stand/mips/beri/common/beri.h diff --git a/sys/boot/mips/beri/common/cfi.c b/stand/mips/beri/common/cfi.c similarity index 100% rename from sys/boot/mips/beri/common/cfi.c rename to stand/mips/beri/common/cfi.c diff --git a/sys/boot/mips/beri/common/cfi.h b/stand/mips/beri/common/cfi.h similarity index 100% rename from sys/boot/mips/beri/common/cfi.h rename to stand/mips/beri/common/cfi.h diff --git a/sys/boot/mips/beri/common/common.ldscript b/stand/mips/beri/common/common.ldscript similarity index 100% rename from sys/boot/mips/beri/common/common.ldscript rename to stand/mips/beri/common/common.ldscript diff --git a/sys/boot/mips/beri/common/cons.h b/stand/mips/beri/common/cons.h similarity index 100% rename from sys/boot/mips/beri/common/cons.h rename to stand/mips/beri/common/cons.h diff --git a/sys/boot/mips/beri/common/mips.h b/stand/mips/beri/common/mips.h similarity index 100% rename from sys/boot/mips/beri/common/mips.h rename to stand/mips/beri/common/mips.h diff --git a/sys/boot/mips/beri/common/sdcard.c b/stand/mips/beri/common/sdcard.c similarity index 100% rename from sys/boot/mips/beri/common/sdcard.c rename to stand/mips/beri/common/sdcard.c diff --git a/sys/boot/mips/beri/common/sdcard.h b/stand/mips/beri/common/sdcard.h similarity index 100% rename from sys/boot/mips/beri/common/sdcard.h rename to stand/mips/beri/common/sdcard.h diff --git a/sys/boot/mips/beri/loader/Makefile b/stand/mips/beri/loader/Makefile similarity index 100% rename from sys/boot/mips/beri/loader/Makefile rename to stand/mips/beri/loader/Makefile diff --git a/sys/boot/mips/beri/loader/arch.c b/stand/mips/beri/loader/arch.c similarity index 100% rename from sys/boot/mips/beri/loader/arch.c rename to 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 similarity index 100% rename from sys/boot/mips/beri/loader/beri_console.c rename to 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 similarity index 100% rename from sys/boot/mips/beri/loader/beri_disk_cfi.c rename to 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 similarity index 100% rename from sys/boot/mips/beri/loader/beri_disk_sdcard.c rename to 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 similarity index 100% rename from sys/boot/mips/beri/loader/devicename.c rename to stand/mips/beri/loader/devicename.c diff --git a/sys/boot/mips/beri/loader/exec.c b/stand/mips/beri/loader/exec.c similarity index 100% rename from sys/boot/mips/beri/loader/exec.c rename to stand/mips/beri/loader/exec.c diff --git a/sys/boot/mips/beri/loader/help.mips b/stand/mips/beri/loader/help.mips similarity index 100% rename from sys/boot/mips/beri/loader/help.mips rename to stand/mips/beri/loader/help.mips diff --git a/sys/boot/mips/beri/loader/loader.h b/stand/mips/beri/loader/loader.h similarity index 100% rename from sys/boot/mips/beri/loader/loader.h rename to stand/mips/beri/loader/loader.h diff --git a/sys/boot/mips/beri/loader/loader.ldscript b/stand/mips/beri/loader/loader.ldscript similarity index 100% rename from sys/boot/mips/beri/loader/loader.ldscript rename to stand/mips/beri/loader/loader.ldscript diff --git a/sys/boot/mips/beri/loader/main.c b/stand/mips/beri/loader/main.c similarity index 100% rename from sys/boot/mips/beri/loader/main.c rename to stand/mips/beri/loader/main.c diff --git a/sys/boot/mips/beri/loader/metadata.c b/stand/mips/beri/loader/metadata.c similarity index 100% rename from sys/boot/mips/beri/loader/metadata.c rename to stand/mips/beri/loader/metadata.c diff --git a/sys/boot/mips/beri/loader/start.S b/stand/mips/beri/loader/start.S similarity index 100% rename from sys/boot/mips/beri/loader/start.S rename to stand/mips/beri/loader/start.S diff --git a/sys/boot/mips/beri/loader/version b/stand/mips/beri/loader/version similarity index 100% rename from sys/boot/mips/beri/loader/version rename to stand/mips/beri/loader/version diff --git a/sys/boot/mips/uboot/Makefile b/stand/mips/uboot/Makefile similarity index 100% rename from sys/boot/mips/uboot/Makefile rename to stand/mips/uboot/Makefile diff --git a/sys/boot/mips/uboot/conf.c b/stand/mips/uboot/conf.c similarity index 100% rename from sys/boot/mips/uboot/conf.c rename to stand/mips/uboot/conf.c diff --git a/sys/boot/mips/uboot/help.uboot b/stand/mips/uboot/help.uboot similarity index 100% rename from sys/boot/mips/uboot/help.uboot rename to stand/mips/uboot/help.uboot diff --git a/sys/boot/mips/uboot/ldscript.mips b/stand/mips/uboot/ldscript.mips similarity index 100% rename from sys/boot/mips/uboot/ldscript.mips rename to stand/mips/uboot/ldscript.mips diff --git a/sys/boot/mips/uboot/loader.conf b/stand/mips/uboot/loader.conf similarity index 100% rename from sys/boot/mips/uboot/loader.conf rename to stand/mips/uboot/loader.conf diff --git a/sys/boot/mips/uboot/start.S b/stand/mips/uboot/start.S similarity index 100% rename from sys/boot/mips/uboot/start.S rename to stand/mips/uboot/start.S diff --git a/sys/boot/mips/uboot/version b/stand/mips/uboot/version similarity index 100% rename from sys/boot/mips/uboot/version rename to stand/mips/uboot/version diff --git a/sys/boot/ofw/Makefile b/stand/ofw/Makefile similarity index 100% rename from sys/boot/ofw/Makefile rename to stand/ofw/Makefile diff --git a/sys/boot/ofw/Makefile.inc b/stand/ofw/Makefile.inc similarity index 100% rename from sys/boot/ofw/Makefile.inc rename to stand/ofw/Makefile.inc diff --git a/sys/boot/ofw/common/Makefile.inc b/stand/ofw/common/Makefile.inc similarity index 100% rename from sys/boot/ofw/common/Makefile.inc rename to stand/ofw/common/Makefile.inc diff --git a/sys/boot/ofw/common/main.c b/stand/ofw/common/main.c similarity index 100% rename from sys/boot/ofw/common/main.c rename to stand/ofw/common/main.c diff --git a/sys/boot/ofw/libofw/Makefile b/stand/ofw/libofw/Makefile similarity index 100% rename from sys/boot/ofw/libofw/Makefile rename to stand/ofw/libofw/Makefile diff --git a/sys/boot/ofw/libofw/devicename.c b/stand/ofw/libofw/devicename.c similarity index 100% rename from sys/boot/ofw/libofw/devicename.c rename to stand/ofw/libofw/devicename.c diff --git a/sys/boot/ofw/libofw/elf_freebsd.c b/stand/ofw/libofw/elf_freebsd.c similarity index 100% rename from sys/boot/ofw/libofw/elf_freebsd.c rename to stand/ofw/libofw/elf_freebsd.c diff --git a/sys/boot/ofw/libofw/libofw.h b/stand/ofw/libofw/libofw.h similarity index 100% rename from sys/boot/ofw/libofw/libofw.h rename to stand/ofw/libofw/libofw.h diff --git a/sys/boot/ofw/libofw/ofw_console.c b/stand/ofw/libofw/ofw_console.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_console.c rename to stand/ofw/libofw/ofw_console.c diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/stand/ofw/libofw/ofw_copy.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_copy.c rename to stand/ofw/libofw/ofw_copy.c diff --git a/sys/boot/ofw/libofw/ofw_disk.c b/stand/ofw/libofw/ofw_disk.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_disk.c rename to stand/ofw/libofw/ofw_disk.c diff --git a/sys/boot/ofw/libofw/ofw_memory.c b/stand/ofw/libofw/ofw_memory.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_memory.c rename to stand/ofw/libofw/ofw_memory.c diff --git a/sys/boot/ofw/libofw/ofw_module.c b/stand/ofw/libofw/ofw_module.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_module.c rename to stand/ofw/libofw/ofw_module.c diff --git a/sys/boot/ofw/libofw/ofw_net.c b/stand/ofw/libofw/ofw_net.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_net.c rename to stand/ofw/libofw/ofw_net.c diff --git a/sys/boot/ofw/libofw/ofw_reboot.c b/stand/ofw/libofw/ofw_reboot.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_reboot.c rename to stand/ofw/libofw/ofw_reboot.c diff --git a/sys/boot/ofw/libofw/ofw_time.c b/stand/ofw/libofw/ofw_time.c similarity index 100% rename from sys/boot/ofw/libofw/ofw_time.c rename to stand/ofw/libofw/ofw_time.c diff --git a/sys/boot/ofw/libofw/openfirm.c b/stand/ofw/libofw/openfirm.c similarity index 100% rename from sys/boot/ofw/libofw/openfirm.c rename to stand/ofw/libofw/openfirm.c diff --git a/sys/boot/ofw/libofw/openfirm.h b/stand/ofw/libofw/openfirm.h similarity index 100% rename from sys/boot/ofw/libofw/openfirm.h rename to stand/ofw/libofw/openfirm.h diff --git a/sys/boot/ofw/libofw/ppc64_elf_freebsd.c b/stand/ofw/libofw/ppc64_elf_freebsd.c similarity index 100% rename from sys/boot/ofw/libofw/ppc64_elf_freebsd.c rename to stand/ofw/libofw/ppc64_elf_freebsd.c diff --git a/sys/boot/powerpc/Makefile b/stand/powerpc/Makefile similarity index 100% rename from sys/boot/powerpc/Makefile rename to stand/powerpc/Makefile diff --git a/sys/boot/powerpc/Makefile.inc b/stand/powerpc/Makefile.inc similarity index 100% rename from sys/boot/powerpc/Makefile.inc rename to stand/powerpc/Makefile.inc diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile similarity index 100% rename from sys/boot/powerpc/boot1.chrp/Makefile rename to stand/powerpc/boot1.chrp/Makefile diff --git a/sys/boot/powerpc/boot1.chrp/Makefile.hfs b/stand/powerpc/boot1.chrp/Makefile.hfs similarity index 100% rename from sys/boot/powerpc/boot1.chrp/Makefile.hfs rename to stand/powerpc/boot1.chrp/Makefile.hfs diff --git a/sys/boot/powerpc/boot1.chrp/boot1.c b/stand/powerpc/boot1.chrp/boot1.c similarity index 100% rename from sys/boot/powerpc/boot1.chrp/boot1.c rename to stand/powerpc/boot1.chrp/boot1.c diff --git a/sys/boot/powerpc/boot1.chrp/bootinfo.txt b/stand/powerpc/boot1.chrp/bootinfo.txt similarity index 100% rename from sys/boot/powerpc/boot1.chrp/bootinfo.txt rename to 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 similarity index 100% rename from sys/boot/powerpc/boot1.chrp/generate-hfs.sh rename to 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 similarity index 100% rename from sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu rename to stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu diff --git a/sys/boot/powerpc/kboot/Makefile b/stand/powerpc/kboot/Makefile similarity index 100% rename from sys/boot/powerpc/kboot/Makefile rename to stand/powerpc/kboot/Makefile diff --git a/sys/boot/powerpc/kboot/conf.c b/stand/powerpc/kboot/conf.c similarity index 100% rename from sys/boot/powerpc/kboot/conf.c rename to stand/powerpc/kboot/conf.c diff --git a/sys/boot/powerpc/kboot/host_syscall.S b/stand/powerpc/kboot/host_syscall.S similarity index 100% rename from sys/boot/powerpc/kboot/host_syscall.S rename to stand/powerpc/kboot/host_syscall.S diff --git a/sys/boot/powerpc/kboot/host_syscall.h b/stand/powerpc/kboot/host_syscall.h similarity index 100% rename from sys/boot/powerpc/kboot/host_syscall.h rename to stand/powerpc/kboot/host_syscall.h diff --git a/sys/boot/powerpc/kboot/hostcons.c b/stand/powerpc/kboot/hostcons.c similarity index 100% rename from sys/boot/powerpc/kboot/hostcons.c rename to stand/powerpc/kboot/hostcons.c diff --git a/sys/boot/powerpc/kboot/hostdisk.c b/stand/powerpc/kboot/hostdisk.c similarity index 100% rename from sys/boot/powerpc/kboot/hostdisk.c rename to stand/powerpc/kboot/hostdisk.c diff --git a/sys/boot/powerpc/kboot/kbootfdt.c b/stand/powerpc/kboot/kbootfdt.c similarity index 100% rename from sys/boot/powerpc/kboot/kbootfdt.c rename to stand/powerpc/kboot/kbootfdt.c diff --git a/sys/boot/powerpc/kboot/kerneltramp.S b/stand/powerpc/kboot/kerneltramp.S similarity index 100% rename from sys/boot/powerpc/kboot/kerneltramp.S rename to stand/powerpc/kboot/kerneltramp.S diff --git a/sys/boot/powerpc/kboot/ldscript.powerpc b/stand/powerpc/kboot/ldscript.powerpc similarity index 100% rename from sys/boot/powerpc/kboot/ldscript.powerpc rename to stand/powerpc/kboot/ldscript.powerpc diff --git a/sys/boot/powerpc/kboot/main.c b/stand/powerpc/kboot/main.c similarity index 100% rename from sys/boot/powerpc/kboot/main.c rename to stand/powerpc/kboot/main.c diff --git a/sys/boot/powerpc/kboot/metadata.c b/stand/powerpc/kboot/metadata.c similarity index 100% rename from sys/boot/powerpc/kboot/metadata.c rename to stand/powerpc/kboot/metadata.c diff --git a/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c b/stand/powerpc/kboot/ppc64_elf_freebsd.c similarity index 100% rename from sys/boot/powerpc/kboot/ppc64_elf_freebsd.c rename to stand/powerpc/kboot/ppc64_elf_freebsd.c diff --git a/sys/boot/powerpc/kboot/version b/stand/powerpc/kboot/version similarity index 100% rename from sys/boot/powerpc/kboot/version rename to stand/powerpc/kboot/version diff --git a/sys/boot/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile similarity index 100% rename from sys/boot/powerpc/ofw/Makefile rename to stand/powerpc/ofw/Makefile diff --git a/sys/boot/powerpc/ofw/conf.c b/stand/powerpc/ofw/conf.c similarity index 100% rename from sys/boot/powerpc/ofw/conf.c rename to stand/powerpc/ofw/conf.c diff --git a/sys/boot/powerpc/ofw/ldscript.powerpc b/stand/powerpc/ofw/ldscript.powerpc similarity index 100% rename from sys/boot/powerpc/ofw/ldscript.powerpc rename to stand/powerpc/ofw/ldscript.powerpc diff --git a/sys/boot/powerpc/ofw/metadata.c b/stand/powerpc/ofw/metadata.c similarity index 100% rename from sys/boot/powerpc/ofw/metadata.c rename to stand/powerpc/ofw/metadata.c diff --git a/sys/boot/powerpc/ofw/ofwfdt.c b/stand/powerpc/ofw/ofwfdt.c similarity index 100% rename from sys/boot/powerpc/ofw/ofwfdt.c rename to stand/powerpc/ofw/ofwfdt.c diff --git a/sys/boot/powerpc/ofw/start.c b/stand/powerpc/ofw/start.c similarity index 100% rename from sys/boot/powerpc/ofw/start.c rename to stand/powerpc/ofw/start.c diff --git a/sys/boot/powerpc/ofw/version b/stand/powerpc/ofw/version similarity index 100% rename from sys/boot/powerpc/ofw/version rename to stand/powerpc/ofw/version diff --git a/sys/boot/powerpc/ps3/Makefile b/stand/powerpc/ps3/Makefile similarity index 100% rename from sys/boot/powerpc/ps3/Makefile rename to stand/powerpc/ps3/Makefile diff --git a/sys/boot/powerpc/ps3/conf.c b/stand/powerpc/ps3/conf.c similarity index 100% rename from sys/boot/powerpc/ps3/conf.c rename to stand/powerpc/ps3/conf.c diff --git a/sys/boot/powerpc/ps3/devicename.c b/stand/powerpc/ps3/devicename.c similarity index 100% rename from sys/boot/powerpc/ps3/devicename.c rename to stand/powerpc/ps3/devicename.c diff --git a/sys/boot/powerpc/ps3/ldscript.powerpc b/stand/powerpc/ps3/ldscript.powerpc similarity index 100% rename from sys/boot/powerpc/ps3/ldscript.powerpc rename to stand/powerpc/ps3/ldscript.powerpc diff --git a/sys/boot/powerpc/ps3/lv1call.S b/stand/powerpc/ps3/lv1call.S similarity index 100% rename from sys/boot/powerpc/ps3/lv1call.S rename to stand/powerpc/ps3/lv1call.S diff --git a/sys/boot/powerpc/ps3/lv1call.h b/stand/powerpc/ps3/lv1call.h similarity index 100% rename from sys/boot/powerpc/ps3/lv1call.h rename to stand/powerpc/ps3/lv1call.h diff --git a/sys/boot/powerpc/ps3/main.c b/stand/powerpc/ps3/main.c similarity index 100% rename from sys/boot/powerpc/ps3/main.c rename to stand/powerpc/ps3/main.c diff --git a/sys/boot/powerpc/ps3/metadata.c b/stand/powerpc/ps3/metadata.c similarity index 100% rename from sys/boot/powerpc/ps3/metadata.c rename to stand/powerpc/ps3/metadata.c diff --git a/sys/boot/powerpc/ps3/ppc64_elf_freebsd.c b/stand/powerpc/ps3/ppc64_elf_freebsd.c similarity index 100% rename from sys/boot/powerpc/ps3/ppc64_elf_freebsd.c rename to stand/powerpc/ps3/ppc64_elf_freebsd.c diff --git a/sys/boot/powerpc/ps3/ps3.h b/stand/powerpc/ps3/ps3.h similarity index 100% rename from sys/boot/powerpc/ps3/ps3.h rename to stand/powerpc/ps3/ps3.h diff --git a/sys/boot/powerpc/ps3/ps3bus.h b/stand/powerpc/ps3/ps3bus.h similarity index 100% rename from sys/boot/powerpc/ps3/ps3bus.h rename to stand/powerpc/ps3/ps3bus.h diff --git a/sys/boot/powerpc/ps3/ps3cdrom.c b/stand/powerpc/ps3/ps3cdrom.c similarity index 100% rename from sys/boot/powerpc/ps3/ps3cdrom.c rename to stand/powerpc/ps3/ps3cdrom.c diff --git a/sys/boot/powerpc/ps3/ps3cons.c b/stand/powerpc/ps3/ps3cons.c similarity index 100% rename from sys/boot/powerpc/ps3/ps3cons.c rename to stand/powerpc/ps3/ps3cons.c diff --git a/sys/boot/powerpc/ps3/ps3devdesc.h b/stand/powerpc/ps3/ps3devdesc.h similarity index 100% rename from sys/boot/powerpc/ps3/ps3devdesc.h rename to stand/powerpc/ps3/ps3devdesc.h diff --git a/sys/boot/powerpc/ps3/ps3disk.c b/stand/powerpc/ps3/ps3disk.c similarity index 100% rename from sys/boot/powerpc/ps3/ps3disk.c rename to stand/powerpc/ps3/ps3disk.c diff --git a/sys/boot/powerpc/ps3/ps3mmu.c b/stand/powerpc/ps3/ps3mmu.c similarity index 100% rename from sys/boot/powerpc/ps3/ps3mmu.c rename to stand/powerpc/ps3/ps3mmu.c diff --git a/sys/boot/powerpc/ps3/ps3net.c b/stand/powerpc/ps3/ps3net.c similarity index 100% rename from sys/boot/powerpc/ps3/ps3net.c rename to stand/powerpc/ps3/ps3net.c diff --git a/sys/boot/powerpc/ps3/ps3repo.c b/stand/powerpc/ps3/ps3repo.c similarity index 100% rename from sys/boot/powerpc/ps3/ps3repo.c rename to stand/powerpc/ps3/ps3repo.c diff --git a/sys/boot/powerpc/ps3/ps3repo.h b/stand/powerpc/ps3/ps3repo.h similarity index 100% rename from sys/boot/powerpc/ps3/ps3repo.h rename to stand/powerpc/ps3/ps3repo.h diff --git a/sys/boot/powerpc/ps3/ps3stor.c b/stand/powerpc/ps3/ps3stor.c similarity index 100% rename from sys/boot/powerpc/ps3/ps3stor.c rename to stand/powerpc/ps3/ps3stor.c diff --git a/sys/boot/powerpc/ps3/ps3stor.h b/stand/powerpc/ps3/ps3stor.h similarity index 100% rename from sys/boot/powerpc/ps3/ps3stor.h rename to stand/powerpc/ps3/ps3stor.h diff --git a/sys/boot/powerpc/ps3/start.S b/stand/powerpc/ps3/start.S similarity index 100% rename from sys/boot/powerpc/ps3/start.S rename to stand/powerpc/ps3/start.S diff --git a/sys/boot/powerpc/ps3/version b/stand/powerpc/ps3/version similarity index 100% rename from sys/boot/powerpc/ps3/version rename to stand/powerpc/ps3/version diff --git a/sys/boot/powerpc/uboot/Makefile b/stand/powerpc/uboot/Makefile similarity index 100% rename from sys/boot/powerpc/uboot/Makefile rename to stand/powerpc/uboot/Makefile diff --git a/sys/boot/powerpc/uboot/conf.c b/stand/powerpc/uboot/conf.c similarity index 100% rename from sys/boot/powerpc/uboot/conf.c rename to stand/powerpc/uboot/conf.c diff --git a/sys/boot/powerpc/uboot/ldscript.powerpc b/stand/powerpc/uboot/ldscript.powerpc similarity index 100% rename from sys/boot/powerpc/uboot/ldscript.powerpc rename to stand/powerpc/uboot/ldscript.powerpc diff --git a/sys/boot/powerpc/uboot/start.S b/stand/powerpc/uboot/start.S similarity index 100% rename from sys/boot/powerpc/uboot/start.S rename to stand/powerpc/uboot/start.S diff --git a/sys/boot/powerpc/uboot/version b/stand/powerpc/uboot/version similarity index 100% rename from sys/boot/powerpc/uboot/version rename to stand/powerpc/uboot/version diff --git a/sys/boot/sparc64/Makefile b/stand/sparc64/Makefile similarity index 100% rename from sys/boot/sparc64/Makefile rename to stand/sparc64/Makefile diff --git a/sys/boot/sparc64/Makefile.inc b/stand/sparc64/Makefile.inc similarity index 100% rename from sys/boot/sparc64/Makefile.inc rename to stand/sparc64/Makefile.inc diff --git a/sys/boot/sparc64/boot1/Makefile b/stand/sparc64/boot1/Makefile similarity index 100% rename from sys/boot/sparc64/boot1/Makefile rename to stand/sparc64/boot1/Makefile diff --git a/sys/boot/sparc64/boot1/_start.s b/stand/sparc64/boot1/_start.s similarity index 100% rename from sys/boot/sparc64/boot1/_start.s rename to stand/sparc64/boot1/_start.s diff --git a/sys/boot/sparc64/boot1/boot1.c b/stand/sparc64/boot1/boot1.c similarity index 100% rename from sys/boot/sparc64/boot1/boot1.c rename to stand/sparc64/boot1/boot1.c diff --git a/sys/boot/sparc64/loader/Makefile b/stand/sparc64/loader/Makefile similarity index 100% rename from sys/boot/sparc64/loader/Makefile rename to stand/sparc64/loader/Makefile diff --git a/sys/boot/sparc64/loader/help.sparc64 b/stand/sparc64/loader/help.sparc64 similarity index 100% rename from sys/boot/sparc64/loader/help.sparc64 rename to stand/sparc64/loader/help.sparc64 diff --git a/sys/boot/sparc64/loader/locore.S b/stand/sparc64/loader/locore.S similarity index 100% rename from sys/boot/sparc64/loader/locore.S rename to stand/sparc64/loader/locore.S diff --git a/sys/boot/sparc64/loader/main.c b/stand/sparc64/loader/main.c similarity index 100% rename from sys/boot/sparc64/loader/main.c rename to stand/sparc64/loader/main.c diff --git a/sys/boot/sparc64/loader/metadata.c b/stand/sparc64/loader/metadata.c similarity index 100% rename from sys/boot/sparc64/loader/metadata.c rename to stand/sparc64/loader/metadata.c diff --git a/sys/boot/sparc64/loader/version b/stand/sparc64/loader/version similarity index 100% rename from sys/boot/sparc64/loader/version rename to stand/sparc64/loader/version diff --git a/sys/boot/sparc64/zfsboot/Makefile b/stand/sparc64/zfsboot/Makefile similarity index 100% rename from sys/boot/sparc64/zfsboot/Makefile rename to stand/sparc64/zfsboot/Makefile diff --git a/sys/boot/sparc64/zfsloader/Makefile b/stand/sparc64/zfsloader/Makefile similarity index 100% rename from sys/boot/sparc64/zfsloader/Makefile rename to stand/sparc64/zfsloader/Makefile diff --git a/sys/boot/uboot.mk b/stand/uboot.mk similarity index 100% rename from sys/boot/uboot.mk rename to stand/uboot.mk diff --git a/sys/boot/uboot/Makefile b/stand/uboot/Makefile similarity index 100% rename from sys/boot/uboot/Makefile rename to stand/uboot/Makefile diff --git a/sys/boot/uboot/Makefile.inc b/stand/uboot/Makefile.inc similarity index 100% rename from sys/boot/uboot/Makefile.inc rename to stand/uboot/Makefile.inc diff --git a/sys/boot/uboot/common/main.c b/stand/uboot/common/main.c similarity index 100% rename from sys/boot/uboot/common/main.c rename to stand/uboot/common/main.c diff --git a/sys/boot/uboot/common/metadata.c b/stand/uboot/common/metadata.c similarity index 100% rename from sys/boot/uboot/common/metadata.c rename to stand/uboot/common/metadata.c diff --git a/sys/boot/uboot/fdt/Makefile b/stand/uboot/fdt/Makefile similarity index 100% rename from sys/boot/uboot/fdt/Makefile rename to stand/uboot/fdt/Makefile diff --git a/sys/boot/uboot/fdt/uboot_fdt.c b/stand/uboot/fdt/uboot_fdt.c similarity index 100% rename from sys/boot/uboot/fdt/uboot_fdt.c rename to stand/uboot/fdt/uboot_fdt.c diff --git a/sys/boot/uboot/lib/Makefile b/stand/uboot/lib/Makefile similarity index 100% rename from sys/boot/uboot/lib/Makefile rename to stand/uboot/lib/Makefile diff --git a/sys/boot/uboot/lib/api_public.h b/stand/uboot/lib/api_public.h similarity index 100% rename from sys/boot/uboot/lib/api_public.h rename to stand/uboot/lib/api_public.h diff --git a/sys/boot/uboot/lib/console.c b/stand/uboot/lib/console.c similarity index 100% rename from sys/boot/uboot/lib/console.c rename to stand/uboot/lib/console.c diff --git a/sys/boot/uboot/lib/copy.c b/stand/uboot/lib/copy.c similarity index 100% rename from sys/boot/uboot/lib/copy.c rename to stand/uboot/lib/copy.c diff --git a/sys/boot/uboot/lib/devicename.c b/stand/uboot/lib/devicename.c similarity index 100% rename from sys/boot/uboot/lib/devicename.c rename to stand/uboot/lib/devicename.c diff --git a/sys/boot/uboot/lib/disk.c b/stand/uboot/lib/disk.c similarity index 100% rename from sys/boot/uboot/lib/disk.c rename to stand/uboot/lib/disk.c diff --git a/sys/boot/uboot/lib/elf_freebsd.c b/stand/uboot/lib/elf_freebsd.c similarity index 100% rename from sys/boot/uboot/lib/elf_freebsd.c rename to stand/uboot/lib/elf_freebsd.c diff --git a/sys/boot/uboot/lib/glue.c b/stand/uboot/lib/glue.c similarity index 100% rename from sys/boot/uboot/lib/glue.c rename to stand/uboot/lib/glue.c diff --git a/sys/boot/uboot/lib/glue.h b/stand/uboot/lib/glue.h similarity index 100% rename from sys/boot/uboot/lib/glue.h rename to stand/uboot/lib/glue.h diff --git a/sys/boot/uboot/lib/libuboot.h b/stand/uboot/lib/libuboot.h similarity index 100% rename from sys/boot/uboot/lib/libuboot.h rename to stand/uboot/lib/libuboot.h diff --git a/sys/boot/uboot/lib/module.c b/stand/uboot/lib/module.c similarity index 100% rename from sys/boot/uboot/lib/module.c rename to stand/uboot/lib/module.c diff --git a/sys/boot/uboot/lib/net.c b/stand/uboot/lib/net.c similarity index 100% rename from sys/boot/uboot/lib/net.c rename to stand/uboot/lib/net.c diff --git a/sys/boot/uboot/lib/reboot.c b/stand/uboot/lib/reboot.c similarity index 100% rename from sys/boot/uboot/lib/reboot.c rename to stand/uboot/lib/reboot.c diff --git a/sys/boot/uboot/lib/time.c b/stand/uboot/lib/time.c similarity index 100% rename from sys/boot/uboot/lib/time.c rename to stand/uboot/lib/time.c diff --git a/sys/boot/usb/Makefile b/stand/usb/Makefile similarity index 100% rename from sys/boot/usb/Makefile rename to stand/usb/Makefile diff --git a/sys/boot/usb/Makefile.test b/stand/usb/Makefile.test similarity index 100% rename from sys/boot/usb/Makefile.test rename to stand/usb/Makefile.test diff --git a/sys/boot/usb/bsd_usbloader_test.c b/stand/usb/bsd_usbloader_test.c similarity index 100% rename from sys/boot/usb/bsd_usbloader_test.c rename to stand/usb/bsd_usbloader_test.c diff --git a/sys/boot/usb/storage/umass_common.c b/stand/usb/storage/umass_common.c similarity index 100% rename from sys/boot/usb/storage/umass_common.c rename to stand/usb/storage/umass_common.c diff --git a/sys/boot/usb/storage/umass_common.h b/stand/usb/storage/umass_common.h similarity index 100% rename from sys/boot/usb/storage/umass_common.h rename to stand/usb/storage/umass_common.h diff --git a/sys/boot/usb/storage/umass_loader.c b/stand/usb/storage/umass_loader.c similarity index 100% rename from sys/boot/usb/storage/umass_loader.c rename to stand/usb/storage/umass_loader.c diff --git a/sys/boot/usb/tools/Makefile b/stand/usb/tools/Makefile similarity index 100% rename from sys/boot/usb/tools/Makefile rename to stand/usb/tools/Makefile diff --git a/sys/boot/usb/tools/sysinit.c b/stand/usb/tools/sysinit.c similarity index 100% rename from sys/boot/usb/tools/sysinit.c rename to stand/usb/tools/sysinit.c diff --git a/sys/boot/usb/usb_busdma_loader.c b/stand/usb/usb_busdma_loader.c similarity index 100% rename from sys/boot/usb/usb_busdma_loader.c rename to stand/usb/usb_busdma_loader.c diff --git a/sys/boot/usb/usbcore.mk b/stand/usb/usbcore.mk similarity index 100% rename from sys/boot/usb/usbcore.mk rename to stand/usb/usbcore.mk diff --git a/sys/boot/userboot/Makefile b/stand/userboot/Makefile similarity index 100% rename from sys/boot/userboot/Makefile rename to stand/userboot/Makefile diff --git a/sys/boot/userboot/Makefile.inc b/stand/userboot/Makefile.inc similarity index 100% rename from sys/boot/userboot/Makefile.inc rename to stand/userboot/Makefile.inc diff --git a/sys/boot/userboot/test/Makefile b/stand/userboot/test/Makefile similarity index 100% rename from sys/boot/userboot/test/Makefile rename to stand/userboot/test/Makefile diff --git a/sys/boot/userboot/test/Makefile.depend b/stand/userboot/test/Makefile.depend similarity index 100% rename from sys/boot/userboot/test/Makefile.depend rename to stand/userboot/test/Makefile.depend diff --git a/sys/boot/userboot/test/test.c b/stand/userboot/test/test.c similarity index 100% rename from sys/boot/userboot/test/test.c rename to stand/userboot/test/test.c diff --git a/sys/boot/userboot/userboot.h b/stand/userboot/userboot.h similarity index 100% rename from sys/boot/userboot/userboot.h rename to stand/userboot/userboot.h diff --git a/sys/boot/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile similarity index 100% rename from sys/boot/userboot/userboot/Makefile rename to stand/userboot/userboot/Makefile diff --git a/sys/boot/userboot/userboot/Makefile.depend b/stand/userboot/userboot/Makefile.depend similarity index 80% rename from sys/boot/userboot/userboot/Makefile.depend rename to stand/userboot/userboot/Makefile.depend index 0d4affa29aee..87e0acc0f3b5 100644 --- a/sys/boot/userboot/userboot/Makefile.depend +++ b/stand/userboot/userboot/Makefile.depend @@ -4,9 +4,9 @@ DIRDEPS = \ include \ include/xlocale \ - sys/boot/ficl \ - sys/boot/libsa \ - sys/boot/zfs \ + stand/ficl \ + stand/libsa \ + stand/zfs \ .include diff --git a/sys/boot/userboot/userboot/autoload.c b/stand/userboot/userboot/autoload.c similarity index 100% rename from sys/boot/userboot/userboot/autoload.c rename to stand/userboot/userboot/autoload.c diff --git a/sys/boot/userboot/userboot/biossmap.c b/stand/userboot/userboot/biossmap.c similarity index 100% rename from sys/boot/userboot/userboot/biossmap.c rename to stand/userboot/userboot/biossmap.c diff --git a/sys/boot/userboot/userboot/bootinfo.c b/stand/userboot/userboot/bootinfo.c similarity index 100% rename from sys/boot/userboot/userboot/bootinfo.c rename to stand/userboot/userboot/bootinfo.c diff --git a/sys/boot/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c similarity index 100% rename from sys/boot/userboot/userboot/bootinfo32.c rename to stand/userboot/userboot/bootinfo32.c diff --git a/sys/boot/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c similarity index 100% rename from sys/boot/userboot/userboot/bootinfo64.c rename to stand/userboot/userboot/bootinfo64.c diff --git a/sys/boot/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c similarity index 100% rename from sys/boot/userboot/userboot/conf.c rename to stand/userboot/userboot/conf.c diff --git a/sys/boot/userboot/userboot/copy.c b/stand/userboot/userboot/copy.c similarity index 100% rename from sys/boot/userboot/userboot/copy.c rename to stand/userboot/userboot/copy.c diff --git a/sys/boot/userboot/userboot/devicename.c b/stand/userboot/userboot/devicename.c similarity index 100% rename from sys/boot/userboot/userboot/devicename.c rename to stand/userboot/userboot/devicename.c diff --git a/sys/boot/userboot/userboot/elf32_freebsd.c b/stand/userboot/userboot/elf32_freebsd.c similarity index 100% rename from sys/boot/userboot/userboot/elf32_freebsd.c rename to stand/userboot/userboot/elf32_freebsd.c diff --git a/sys/boot/userboot/userboot/elf64_freebsd.c b/stand/userboot/userboot/elf64_freebsd.c similarity index 100% rename from sys/boot/userboot/userboot/elf64_freebsd.c rename to stand/userboot/userboot/elf64_freebsd.c diff --git a/sys/boot/userboot/userboot/host.c b/stand/userboot/userboot/host.c similarity index 100% rename from sys/boot/userboot/userboot/host.c rename to stand/userboot/userboot/host.c diff --git a/sys/boot/userboot/userboot/libuserboot.h b/stand/userboot/userboot/libuserboot.h similarity index 100% rename from sys/boot/userboot/userboot/libuserboot.h rename to stand/userboot/userboot/libuserboot.h diff --git a/sys/boot/userboot/userboot/main.c b/stand/userboot/userboot/main.c similarity index 100% rename from sys/boot/userboot/userboot/main.c rename to stand/userboot/userboot/main.c diff --git a/sys/boot/userboot/userboot/userboot_cons.c b/stand/userboot/userboot/userboot_cons.c similarity index 100% rename from sys/boot/userboot/userboot/userboot_cons.c rename to stand/userboot/userboot/userboot_cons.c diff --git a/sys/boot/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c similarity index 100% rename from sys/boot/userboot/userboot/userboot_disk.c rename to stand/userboot/userboot/userboot_disk.c diff --git a/sys/boot/userboot/userboot/version b/stand/userboot/userboot/version similarity index 100% rename from sys/boot/userboot/userboot/version rename to stand/userboot/userboot/version diff --git a/sys/boot/zfs/Makefile b/stand/zfs/Makefile similarity index 100% rename from sys/boot/zfs/Makefile rename to stand/zfs/Makefile diff --git a/sys/boot/zfs/Makefile.depend b/stand/zfs/Makefile.depend similarity index 100% rename from sys/boot/zfs/Makefile.depend rename to stand/zfs/Makefile.depend diff --git a/sys/boot/zfs/devicename_stubs.c b/stand/zfs/devicename_stubs.c similarity index 100% rename from sys/boot/zfs/devicename_stubs.c rename to stand/zfs/devicename_stubs.c diff --git a/sys/boot/zfs/libzfs.h b/stand/zfs/libzfs.h similarity index 100% rename from sys/boot/zfs/libzfs.h rename to stand/zfs/libzfs.h diff --git a/sys/boot/zfs/zfs.c b/stand/zfs/zfs.c similarity index 100% rename from sys/boot/zfs/zfs.c rename to stand/zfs/zfs.c diff --git a/sys/boot/zfs/zfsimpl.c b/stand/zfs/zfsimpl.c similarity index 100% rename from sys/boot/zfs/zfsimpl.c rename to stand/zfs/zfsimpl.c diff --git a/sys/boot/zfs32/Makefile b/stand/zfs32/Makefile similarity index 100% rename from sys/boot/zfs32/Makefile rename to stand/zfs32/Makefile diff --git a/sys/boot/zfs32/Makefile.depend b/stand/zfs32/Makefile.depend similarity index 100% rename from sys/boot/zfs32/Makefile.depend rename to stand/zfs32/Makefile.depend diff --git a/sys/Makefile b/sys/Makefile index 0de854341ff5..760c2073e5ee 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 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 -# The boot loader -.if ${MK_BOOT} != "no" -SUBDIR= boot -.endif - # Loadable kernel modules .if defined(MODULES_WITH_WORLD) diff --git a/sys/boot/i386/loader/Makefile.depend b/sys/boot/i386/loader/Makefile.depend deleted file mode 100644 index 5d4398105e2a..000000000000 --- a/sys/boot/i386/loader/Makefile.depend +++ /dev/null @@ -1,20 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - include/xlocale \ - sys/boot/ficl32 \ - sys/boot/geli \ - sys/boot/i386/btx/btx \ - sys/boot/i386/btx/btxldr \ - sys/boot/i386/btx/lib \ - sys/boot/i386/libi386 \ - sys/boot/libsa32 \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/sys/boot/i386/zfsloader/Makefile.depend b/sys/boot/i386/zfsloader/Makefile.depend deleted file mode 100644 index d17b39324022..000000000000 --- a/sys/boot/i386/zfsloader/Makefile.depend +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - include/xlocale \ - sys/boot/ficl32 \ - sys/boot/geli \ - sys/boot/i386/btx/btx \ - sys/boot/i386/btx/btxldr \ - sys/boot/i386/btx/lib \ - sys/boot/i386/libi386 \ - sys/boot/libsa32 \ - sys/boot/zfs32 \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh index e56a33a41c0e..91770e33f556 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/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend index c9a880aec3aa..7410751c77b4 100644 --- a/targets/pseudo/userland/lib/Makefile.depend +++ b/targets/pseudo/userland/lib/Makefile.depend @@ -196,7 +196,7 @@ DIRDEPS+= \ .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "powerpc" -DIRDEPS+= sys/boot/libsa32 +DIRDEPS+= stand/libsa32 .endif .if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mfilter} diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend index 6d473ea1f88c..7b4700a5d201 100644 --- a/targets/pseudo/userland/misc/Makefile.depend +++ b/targets/pseudo/userland/misc/Makefile.depend @@ -6,12 +6,12 @@ .include .endif -_sys_boot_efi= sys/boot/efi/loader sys/boot/efi/boot1 +_sys_boot_efi= stand/efi/loader stand/efi/boot1 .if ${MK_FDT} != "no" -_sys_boot_fdt= sys/boot/fdt sys/boot/efi/fdt +_sys_boot_fdt= stand/fdt stand/efi/fdt .endif .if ${MK_ZFS} != "no" -_sys_boot_zfs= sys/boot/zfs +_sys_boot_zfs= stand/zfs .endif DIRDEPS = \ @@ -22,40 +22,40 @@ DIRDEPS = \ rescue/rescue \ .if ${MK_BOOT} != "no" -DIRDEPS+= sys/boot/common +DIRDEPS+= stand/common .if ${MK_FORTH} != "no" DIRDEPS+= \ - sys/boot/ficl \ - sys/boot/forth \ + stand/ficl \ + stand/forth \ .endif DIRDEPS.x86sys= \ - sys/boot/efi/libefi \ - sys/boot/geli \ - sys/boot/i386/boot0 \ - sys/boot/i386/boot0sio \ - sys/boot/i386/boot2 \ - sys/boot/i386/btx/btx \ - sys/boot/i386/btx/btxldr \ - sys/boot/i386/btx/lib \ - sys/boot/i386/cdboot \ - sys/boot/i386/gptboot \ - sys/boot/i386/libfirewire \ - sys/boot/i386/libi386 \ - sys/boot/i386/loader \ - sys/boot/i386/mbr \ - sys/boot/i386/pmbr \ - sys/boot/i386/pxeldr \ - sys/boot/libsa32 \ + stand/efi/libefi \ + stand/geli \ + stand/i386/boot0 \ + stand/i386/boot0sio \ + stand/i386/boot2 \ + stand/i386/btx/btx \ + stand/i386/btx/btxldr \ + stand/i386/btx/lib \ + stand/i386/cdboot \ + stand/i386/gptboot \ + stand/i386/libfirewire \ + stand/i386/libi386 \ + stand/i386/loader \ + stand/i386/mbr \ + stand/i386/pmbr \ + stand/i386/pxeldr \ + stand/libsa32 \ ${_sys_boot_zfs} \ .if ${MK_ZFS} != "no" DIRDEPS.x86sys+= \ - sys/boot/i386/gptzfsboot \ - sys/boot/i386/zfsboot \ - sys/boot/i386/zfsloader \ + stand/i386/gptzfsboot \ + stand/i386/zfsboot \ + stand/i386/zfsloader \ DIRDEPS+= \ sbin/zfsbootcfg \ @@ -65,13 +65,13 @@ DIRDEPS+= \ DIRDEPS.amd64= \ ${DIRDEPS.x86sys} \ ${_sys_boot_efi} \ - sys/boot/ficl32 \ - sys/boot/userboot/test \ - sys/boot/userboot/userboot \ + stand/ficl32 \ + stand/userboot/test \ + stand/userboot/userboot \ .if ${MK_ZFS} != "no" DIRDEPS.amd64+= \ - sys/boot/zfs32 \ + stand/zfs32 \ .endif @@ -83,9 +83,9 @@ DIRDEPS+= \ DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi} DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi} -DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} sys/boot/i386/kgzldr -DIRDEPS.powerpc= ${_sys_boot_fdt} sys/boot/libsa32 sys/boot/ofw sys/boot/uboot -DIRDEPS.sparc64= sys/boot/ofw ${_sys_boot_zfs} +DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} stand/i386/kgzldr +DIRDEPS.powerpc= ${_sys_boot_fdt} stand/libsa32 stand/ofw stand/uboot +DIRDEPS.sparc64= stand/ofw ${_sys_boot_zfs} .endif DIRDEPS+= ${DIRDEPS.${MACHINE}:U} diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend index 3bac4b78d4a8..9946a8370552 100644 --- a/targets/pseudo/userland/share/Makefile.depend +++ b/targets/pseudo/userland/share/Makefile.depend @@ -91,7 +91,7 @@ DIRDEPS = \ share/xml/atf \ share/xsl/atf \ share/zoneinfo \ - sys/boot/man \ + stand/man \ .include diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh index 3b607b4c4a1a..495e84b1ebaa 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 026f83ea647d..7d54dfca0427 100644 --- a/tools/tools/bootparttest/Makefile +++ b/tools/tools/bootparttest/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${SRCTOP}/sys/boot/common +.PATH: ${SRCTOP}/stand/common BINDIR?= /usr/bin @@ -9,7 +9,7 @@ MAN= SRCS= bootparttest.c crc32.c stub.c part.c disk.c -CFLAGS= -I${SRCTOP}/sys/boot/common \ +CFLAGS= -I${SRCTOP}/stand/common \ -DLOADER_GPT_SUPPORT -DLOADER_MBR_SUPPORT -DPART_DEBUG \ -DDISK_DEBUG diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile index 1f6084effa0a..acb510de70a9 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 f0241b84f43b..48bed64c26e4 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 diff --git a/usr.sbin/efivar/Makefile b/usr.sbin/efivar/Makefile index 89d453eeb962..92f8a70b1c95 100644 --- a/usr.sbin/efivar/Makefile +++ b/usr.sbin/efivar/Makefile @@ -7,7 +7,7 @@ LIBADD= efivar SRCS= efivar.c efiutil.c -EFIBOOT=${SRCTOP}/sys/boot/efi +EFIBOOT=${SRCTOP}/stand/efi CFLAGS+= -I${EFIBOOT}/include .include