MFC r325834,r325997,326502: Move sys/boot to stand/
This is effectively a direct commit to stable/11, due to differences between stable/11 and head. Changes to DTS in sys/boot/fdt/dts were often accompanied by kernel changes. Many of these were also risc-v updates that likely had many more dependencies to MFC. Because of this, sys/boot/fdt/dts remains as-is while everything else in sys/boot relocates to stand/. r325834: Move sys/boot to stand. Fix all references to new location r325997: Remove empty directories. r326502: Document the sys/boot -> stand move in hier.7 and the top-level README.
This commit is contained in:
parent
37fdbfce5a
commit
d3e0854fc7
@ -87,7 +87,7 @@ sh(1) jilles Pre-commit review requested. This also applies
|
||||
compiled in as builtins.
|
||||
share/mk imp, bapt, bdrewery, emaste, sjg Make is hard.
|
||||
share/mk/*.test.mk freebsd-testing,ngie (same list as share/mk too) Pre-commit review requested.
|
||||
sys/boot/forth dteske Pre-commit review requested.
|
||||
stand/forth dteske Pre-commit review requested.
|
||||
sys/compat/linuxkpi hselasky If in doubt, ask.
|
||||
sys/dev/e1000 erj Pre-commit phabricator review requested.
|
||||
sys/dev/ixgbe erj Pre-commit phabricator review requested.
|
||||
|
@ -252,6 +252,9 @@ SUBDIR+=secure
|
||||
.if !defined(NO_SHARE)
|
||||
SUBDIR+=share
|
||||
.endif
|
||||
.if ${MK_BOOT} != "no"
|
||||
SUBDIR+=stand
|
||||
.endif
|
||||
SUBDIR+=sys usr.bin usr.sbin
|
||||
.if ${MK_TESTS} != "no"
|
||||
SUBDIR+= tests
|
||||
@ -1903,7 +1906,7 @@ _clang_libs= lib/clang
|
||||
_gcc= gnu/usr.bin/cc
|
||||
.endif
|
||||
.if ${MK_USB} != "no"
|
||||
_usb_tools= sys/boot/usb/tools
|
||||
_usb_tools= stand/usb/tools
|
||||
.endif
|
||||
|
||||
cross-tools: .MAKE .PHONY
|
||||
|
2
README
2
README
@ -66,6 +66,8 @@ secure Cryptographic libraries and commands.
|
||||
|
||||
share Shared resources.
|
||||
|
||||
stand Boot loader sources.
|
||||
|
||||
sys Kernel sources.
|
||||
|
||||
tests Regression tests which can be run by Kyua. See tests/README
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
@ -17,9 +17,9 @@ write_partition_layout() {
|
||||
_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"
|
||||
_OBJDIR="$(realpath ${_OBJDIR})"
|
||||
if [ -d "${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then
|
||||
BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
|
||||
BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/stand"
|
||||
else
|
||||
BOOTFILES="/${_OBJDIR}/sys/boot"
|
||||
BOOTFILES="/${_OBJDIR}/stand"
|
||||
fi
|
||||
|
||||
case "${TARGET}:${TARGET_ARCH}" in
|
||||
|
@ -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
|
||||
|
@ -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).
|
||||
#
|
||||
|
@ -369,7 +369,7 @@ By default the
|
||||
.Xr pxeboot 8
|
||||
loader retrieves the kernel via NFS.
|
||||
Defining this and recompiling
|
||||
.Pa /usr/src/sys/boot
|
||||
.Pa /usr/src/stand
|
||||
will cause it to retrieve the kernel via TFTP.
|
||||
This allows
|
||||
.Xr pxeboot 8
|
||||
@ -380,7 +380,7 @@ rather than load the server's kernel.
|
||||
.It Va LOADER_FIREWIRE_SUPPORT
|
||||
.Pq Vt bool
|
||||
Defining this and recompiling
|
||||
.Pa /usr/src/sys/boot/i386
|
||||
.Pa /usr/src/stand/i386
|
||||
will add
|
||||
.Xr dcons 4
|
||||
console driver to
|
||||
|
@ -28,7 +28,7 @@
|
||||
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd January 15, 2018
|
||||
.Dd February 11, 2018
|
||||
.Dt HIER 7
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -696,6 +696,8 @@ build directory for files in
|
||||
.It Pa share/
|
||||
source for files in
|
||||
.Pa /usr/share
|
||||
.It Pa stand/
|
||||
boot loader source code
|
||||
.It Pa sys/
|
||||
kernel source code
|
||||
.Bl -tag -width "opencrypto/" -compact
|
||||
|
@ -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
|
||||
|
@ -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
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user