Browse Source

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

Sponsored by:	Netflix
freebsd/12.0-releng/master
imp 2 years ago
parent
commit
433bd38e3a
100 changed files with 20 additions and 17 deletions
  1. +1
    -1
      MAINTAINERS
  2. +4
    -1
      Makefile.inc1
  3. +1
    -1
      lib/libefivar/Makefile
  4. +1
    -1
      release/arm64/PINE64.conf
  5. +1
    -1
      release/arm64/RPI3.conf
  6. +1
    -1
      release/powerpc/generate-hfs.sh
  7. +1
    -1
      release/tools/vmimage.subr
  8. +1
    -1
      share/examples/bootforth/README
  9. +1
    -1
      share/examples/etc/make.conf
  10. +2
    -2
      share/man/man5/make.conf.5
  11. +1
    -1
      share/man/man8/diskless.8
  12. +0
    -0
      stand/Makefile
  13. +0
    -0
      stand/Makefile.amd64
  14. +0
    -0
      stand/Makefile.arm
  15. +0
    -0
      stand/Makefile.arm64
  16. +0
    -0
      stand/Makefile.i386
  17. +0
    -0
      stand/Makefile.inc
  18. +0
    -0
      stand/Makefile.mips
  19. +0
    -0
      stand/Makefile.powerpc
  20. +0
    -0
      stand/Makefile.sparc64
  21. +0
    -0
      stand/arm/Makefile
  22. +0
    -0
      stand/arm/Makefile.inc
  23. +0
    -0
      stand/arm/loader/loader.conf
  24. +0
    -0
      stand/arm/uboot/Makefile
  25. +0
    -0
      stand/arm/uboot/conf.c
  26. +0
    -0
      stand/arm/uboot/help.uboot
  27. +0
    -0
      stand/arm/uboot/ldscript.arm
  28. +0
    -0
      stand/arm/uboot/start.S
  29. +0
    -0
      stand/arm/uboot/version
  30. +0
    -0
      stand/arm64/Makefile
  31. +0
    -0
      stand/arm64/libarm64/cache.c
  32. +0
    -0
      stand/arm64/libarm64/cache.h
  33. +0
    -0
      stand/common/Makefile.depend
  34. +0
    -0
      stand/common/bcache.c
  35. +0
    -0
      stand/common/boot.c
  36. +0
    -0
      stand/common/bootstrap.h
  37. +0
    -0
      stand/common/commands.c
  38. +0
    -0
      stand/common/console.c
  39. +0
    -0
      stand/common/dev_net.c
  40. +0
    -0
      stand/common/dev_net.h
  41. +0
    -0
      stand/common/devopen.c
  42. +0
    -0
      stand/common/disk.c
  43. +0
    -0
      stand/common/disk.h
  44. +0
    -0
      stand/common/help.common
  45. +0
    -0
      stand/common/install.c
  46. +0
    -0
      stand/common/interp.c
  47. +0
    -0
      stand/common/interp_backslash.c
  48. +0
    -0
      stand/common/interp_forth.c
  49. +0
    -0
      stand/common/interp_parse.c
  50. +0
    -0
      stand/common/isapnp.c
  51. +0
    -0
      stand/common/isapnp.h
  52. +0
    -0
      stand/common/load_elf.c
  53. +0
    -0
      stand/common/load_elf32.c
  54. +0
    -0
      stand/common/load_elf32_obj.c
  55. +0
    -0
      stand/common/load_elf64.c
  56. +0
    -0
      stand/common/load_elf64_obj.c
  57. +0
    -0
      stand/common/load_elf_obj.c
  58. +0
    -0
      stand/common/ls.c
  59. +0
    -0
      stand/common/md.c
  60. +0
    -0
      stand/common/merge_help.awk
  61. +0
    -0
      stand/common/misc.c
  62. +0
    -0
      stand/common/module.c
  63. +0
    -0
      stand/common/newvers.sh
  64. +0
    -0
      stand/common/part.c
  65. +0
    -0
      stand/common/part.h
  66. +0
    -0
      stand/common/paths.h
  67. +0
    -0
      stand/common/pnp.c
  68. +0
    -0
      stand/common/rbx.h
  69. +0
    -0
      stand/common/reloc_elf.c
  70. +0
    -0
      stand/common/reloc_elf32.c
  71. +0
    -0
      stand/common/reloc_elf64.c
  72. +0
    -0
      stand/common/self_reloc.c
  73. +2
    -2
      stand/defs.mk
  74. +0
    -0
      stand/efi/Makefile
  75. +0
    -0
      stand/efi/Makefile.inc
  76. +0
    -0
      stand/efi/boot1/Makefile
  77. +3
    -3
      stand/efi/boot1/Makefile.depend
  78. +0
    -0
      stand/efi/boot1/Makefile.fat
  79. +0
    -0
      stand/efi/boot1/boot1.c
  80. +0
    -0
      stand/efi/boot1/boot_module.h
  81. +0
    -0
      stand/efi/boot1/fat-amd64.tmpl.xz
  82. +0
    -0
      stand/efi/boot1/fat-arm.tmpl.xz
  83. +0
    -0
      stand/efi/boot1/fat-arm64.tmpl.xz
  84. +0
    -0
      stand/efi/boot1/fat-i386.tmpl.xz
  85. +0
    -0
      stand/efi/boot1/generate-fat.sh
  86. +0
    -0
      stand/efi/boot1/ufs_module.c
  87. +0
    -0
      stand/efi/boot1/zfs_module.c
  88. +0
    -0
      stand/efi/fdt/Makefile
  89. +0
    -0
      stand/efi/fdt/Makefile.depend
  90. +0
    -0
      stand/efi/fdt/efi_fdt.c
  91. +0
    -0
      stand/efi/include/README
  92. +0
    -0
      stand/efi/include/amd64/efibind.h
  93. +0
    -0
      stand/efi/include/amd64/pe.h
  94. +0
    -0
      stand/efi/include/arm/efibind.h
  95. +0
    -0
      stand/efi/include/arm64/efibind.h
  96. +0
    -0
      stand/efi/include/efi.h
  97. +0
    -0
      stand/efi/include/efi_driver_utils.h
  98. +0
    -0
      stand/efi/include/efi_drivers.h
  99. +0
    -0
      stand/efi/include/efi_nii.h
  100. +0
    -0
      stand/efi/include/efiapi.h

+ 1
- 1
MAINTAINERS View File

@@ -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.


+ 4
- 1
Makefile.inc1 View File

@@ -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


+ 1
- 1
lib/libefivar/Makefile View File

@@ -26,7 +26,7 @@

.include <src.opts.mk>

EFIBOOT=${SRCTOP}/sys/boot/efi
EFIBOOT=${SRCTOP}/stand/efi
EDK2INC=${SRCTOP}/sys/contrib/edk2/Include

.PATH: ${EFIBOOT}/libefi


+ 1
- 1
release/arm64/PINE64.conf View File

@@ -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


+ 1
- 1
release/arm64/RPI3.conf View File

@@ -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


+ 1
- 1
release/powerpc/generate-hfs.sh View File

@@ -32,7 +32,7 @@ cat > bootinfo.txt << EOF
<CHRP-BOOT>
<DESCRIPTION>FreeBSD/powerpc bootloader</DESCRIPTION>
<OS-NAME>FreeBSD</OS-NAME>
<VERSION> $FreeBSD: head/sys/boot/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
<VERSION> $FreeBSD: head/stand/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
-31 00:52:31Z nwhitehorn $ </VERSION>

<COMPATIBLE>


+ 1
- 1
release/tools/vmimage.subr View File

@@ -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


+ 1
- 1
share/examples/bootforth/README View File

@@ -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


+ 1
- 1
share/examples/etc/make.conf View File

@@ -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).
#


+ 2
- 2
share/man/man5/make.conf.5 View File

@@ -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


+ 1
- 1
share/man/man8/diskless.8 View File

@@ -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


sys/boot/Makefile → stand/Makefile View File


sys/boot/Makefile.amd64 → stand/Makefile.amd64 View File


sys/boot/Makefile.arm → stand/Makefile.arm View File


sys/boot/Makefile.arm64 → stand/Makefile.arm64 View File


sys/boot/Makefile.i386 → stand/Makefile.i386 View File


sys/boot/Makefile.inc → stand/Makefile.inc View File


sys/boot/Makefile.mips → stand/Makefile.mips View File


sys/boot/Makefile.powerpc → stand/Makefile.powerpc View File


sys/boot/Makefile.sparc64 → stand/Makefile.sparc64 View File


sys/boot/arm/Makefile → stand/arm/Makefile View File


sys/boot/arm/Makefile.inc → stand/arm/Makefile.inc View File


sys/boot/arm/loader/loader.conf → stand/arm/loader/loader.conf View File


sys/boot/arm/uboot/Makefile → stand/arm/uboot/Makefile View File


sys/boot/arm/uboot/conf.c → stand/arm/uboot/conf.c View File


sys/boot/arm/uboot/help.uboot → stand/arm/uboot/help.uboot View File


sys/boot/arm/uboot/ldscript.arm → stand/arm/uboot/ldscript.arm View File


sys/boot/arm/uboot/start.S → stand/arm/uboot/start.S View File


sys/boot/arm/uboot/version → stand/arm/uboot/version View File


sys/boot/arm64/Makefile → stand/arm64/Makefile View File


sys/boot/arm64/libarm64/cache.c → stand/arm64/libarm64/cache.c View File


sys/boot/arm64/libarm64/cache.h → stand/arm64/libarm64/cache.h View File


sys/boot/common/Makefile.depend → stand/common/Makefile.depend View File


sys/boot/common/bcache.c → stand/common/bcache.c View File


sys/boot/common/boot.c → stand/common/boot.c View File


sys/boot/common/bootstrap.h → stand/common/bootstrap.h View File


sys/boot/common/commands.c → stand/common/commands.c View File


sys/boot/common/console.c → stand/common/console.c View File


sys/boot/common/dev_net.c → stand/common/dev_net.c View File


sys/boot/common/dev_net.h → stand/common/dev_net.h View File


sys/boot/common/devopen.c → stand/common/devopen.c View File


sys/boot/common/disk.c → stand/common/disk.c View File


sys/boot/common/disk.h → stand/common/disk.h View File


sys/boot/common/help.common → stand/common/help.common View File


sys/boot/common/install.c → stand/common/install.c View File


sys/boot/common/interp.c → stand/common/interp.c View File


sys/boot/common/interp_backslash.c → stand/common/interp_backslash.c View File


sys/boot/common/interp_forth.c → stand/common/interp_forth.c View File


sys/boot/common/interp_parse.c → stand/common/interp_parse.c View File


sys/boot/common/isapnp.c → stand/common/isapnp.c View File


sys/boot/common/isapnp.h → stand/common/isapnp.h View File


sys/boot/common/load_elf.c → stand/common/load_elf.c View File


sys/boot/common/load_elf32.c → stand/common/load_elf32.c View File


sys/boot/common/load_elf32_obj.c → stand/common/load_elf32_obj.c View File


sys/boot/common/load_elf64.c → stand/common/load_elf64.c View File


sys/boot/common/load_elf64_obj.c → stand/common/load_elf64_obj.c View File


sys/boot/common/load_elf_obj.c → stand/common/load_elf_obj.c View File


sys/boot/common/ls.c → stand/common/ls.c View File


sys/boot/common/md.c → stand/common/md.c View File


sys/boot/common/merge_help.awk → stand/common/merge_help.awk View File


sys/boot/common/misc.c → stand/common/misc.c View File


sys/boot/common/module.c → stand/common/module.c View File


sys/boot/common/newvers.sh → stand/common/newvers.sh View File


sys/boot/common/part.c → stand/common/part.c View File


sys/boot/common/part.h → stand/common/part.h View File


sys/boot/common/paths.h → stand/common/paths.h View File


sys/boot/common/pnp.c → stand/common/pnp.c View File


sys/boot/common/rbx.h → stand/common/rbx.h View File


sys/boot/common/reloc_elf.c → stand/common/reloc_elf.c View File


sys/boot/common/reloc_elf32.c → stand/common/reloc_elf32.c View File


sys/boot/common/reloc_elf64.c → stand/common/reloc_elf64.c View File


sys/boot/common/self_reloc.c → stand/common/self_reloc.c View File


sys/boot/defs.mk → stand/defs.mk View File

@@ -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

sys/boot/efi/Makefile → stand/efi/Makefile View File


sys/boot/efi/Makefile.inc → stand/efi/Makefile.inc View File


sys/boot/efi/boot1/Makefile → stand/efi/boot1/Makefile View File


sys/boot/efi/boot1/Makefile.depend → stand/efi/boot1/Makefile.depend View File

@@ -5,9 +5,9 @@ DIRDEPS = \
include \
include/xlocale \
lib/libmd \
sys/boot/efi/libefi \
sys/boot/libsa \
sys/boot/zfs \
stand/efi/libefi \
stand/libsa \
stand/zfs \


.include <dirdeps.mk>

sys/boot/efi/boot1/Makefile.fat → stand/efi/boot1/Makefile.fat View File


sys/boot/efi/boot1/boot1.c → stand/efi/boot1/boot1.c View File


sys/boot/efi/boot1/boot_module.h → stand/efi/boot1/boot_module.h View File


sys/boot/efi/boot1/fat-amd64.tmpl.xz → stand/efi/boot1/fat-amd64.tmpl.xz View File


sys/boot/efi/boot1/fat-arm.tmpl.xz → stand/efi/boot1/fat-arm.tmpl.xz View File


sys/boot/efi/boot1/fat-arm64.tmpl.xz → stand/efi/boot1/fat-arm64.tmpl.xz View File


sys/boot/efi/boot1/fat-i386.tmpl.xz → stand/efi/boot1/fat-i386.tmpl.xz View File


sys/boot/efi/boot1/generate-fat.sh → stand/efi/boot1/generate-fat.sh View File


sys/boot/efi/boot1/ufs_module.c → stand/efi/boot1/ufs_module.c View File


sys/boot/efi/boot1/zfs_module.c → stand/efi/boot1/zfs_module.c View File


sys/boot/efi/fdt/Makefile → stand/efi/fdt/Makefile View File


sys/boot/efi/fdt/Makefile.depend → stand/efi/fdt/Makefile.depend View File


sys/boot/efi/fdt/efi_fdt.c → stand/efi/fdt/efi_fdt.c View File


sys/boot/efi/include/README → stand/efi/include/README View File


sys/boot/efi/include/amd64/efibind.h → stand/efi/include/amd64/efibind.h View File


sys/boot/efi/include/amd64/pe.h → stand/efi/include/amd64/pe.h View File


sys/boot/efi/include/arm/efibind.h → stand/efi/include/arm/efibind.h View File


sys/boot/efi/include/arm64/efibind.h → stand/efi/include/arm64/efibind.h View File


sys/boot/efi/include/efi.h → stand/efi/include/efi.h View File


sys/boot/efi/include/efi_driver_utils.h → stand/efi/include/efi_driver_utils.h View File


sys/boot/efi/include/efi_drivers.h → stand/efi/include/efi_drivers.h View File


sys/boot/efi/include/efi_nii.h → stand/efi/include/efi_nii.h View File


sys/boot/efi/include/efiapi.h → stand/efi/include/efiapi.h View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save