summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-08-27 08:07:09 -0400
committerTom Rini <[email protected]>2022-08-27 08:07:09 -0400
commit1573b6a86993fcf80d4badc866a46b78df7e6bda (patch)
treed56567f58fac5b9cd1578df9e0bd5a8982a27235 /doc
parentcd3872ce7e5bf90424a10eda0fe405d04e82adb9 (diff)
parentc2ee5ee7b3393770dbe809ca36814083feffaf83 (diff)
Merge tag 'dm-pull-26aug22' of https://source.denx.de/u-boot/custodians/u-boot-dm
binman/patman documentation improvements other minor fixes
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile1
-rw-r--r--doc/develop/bootstd.rst2
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 6081858726e..f5de65e9278 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -58,6 +58,7 @@ quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
$(SPHINXBUILD) \
-j$(shell nproc) \
-b $2 \
+ -j auto \
-c $(abspath $(srctree)/$(src)) \
-d $(abspath $(BUILDDIR)/.doctrees/$3) \
-D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) \
diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst
index f7fc7257076..1ccc49424eb 100644
--- a/doc/develop/bootstd.rst
+++ b/doc/develop/bootstd.rst
@@ -322,7 +322,7 @@ look like this::
The `sf-bootdev` driver can implement a way to read from the SPI flash, using
the offset and size provided, and return that bootflow file back to the caller.
-When distro boot wants to read the kernel it calls disto_getfile() which must
+When distro boot wants to read the kernel it calls distro_getfile() which must
provide a way to read from the SPI flash. See `distro_boot()` at distro_boot_
for more details.