summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorkevans <kevans@FreeBSD.org>2018-02-12 01:08:44 +0000
committerkevans <kevans@FreeBSD.org>2018-02-12 01:08:44 +0000
commit7d97ee5b28b409c00bfaf12daf5ab497a6038b9d (patch)
tree245306b754606bcf49c0ff17b131b58609b6c7a6 /share
parent43b278e1b66cf4de337a17034087ea785031bd6f (diff)
downloadFreeBSD-src-7d97ee5b28b409c00bfaf12daf5ab497a6038b9d.zip
FreeBSD-src-7d97ee5b28b409c00bfaf12daf5ab497a6038b9d.tar.gz
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.
Diffstat (limited to 'share')
-rw-r--r--share/examples/bootforth/README2
-rw-r--r--share/examples/etc/make.conf2
-rw-r--r--share/man/man5/make.conf.54
-rw-r--r--share/man/man7/hier.74
-rw-r--r--share/man/man8/diskless.82
5 files changed, 8 insertions, 6 deletions
diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README
index b8eb8a0..1ac1342 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 7dbfc51..e191037 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 24ebffb..9887072 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -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
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 73b9795..78ca429 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -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
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index 3fcbc25..668ba21 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
OpenPOWER on IntegriCloud