mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 11:25:21 +01:00
Move sys/boot to stand. Fix all references to new location
Sponsored by: Netflix
This commit is contained in:
1 parent
6eac711556
commit
ca987d4641
706 files changed
+135
-137
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=325834
No files matched your search
+1
-1
@@ -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
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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,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).
|
||||
#
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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>
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 706 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user