summaryrefslogtreecommitdiff
path: root/doc/develop/bootstd.rst
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2022-08-13 07:37:48 -0400
committerTom Rini <[email protected]>2022-08-13 07:37:48 -0400
commit20d4c6052fe5826b3421e86b2f0e76a6c22581a7 (patch)
treeb11d7fc88bcabb8aac89bda03e30c1af40eab613 /doc/develop/bootstd.rst
parent8f9eee8275cf475f6d9435e85aa2d04b61b3cd75 (diff)
parent046d7a0bb1b383fe14bfe950b91ce2e20f835bd4 (diff)
Merge tag 'efi-2022-10-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-10-rc3 Documentation: * Add HTML documentation for patman * Improve binman documentation * Man-page for gpio UEFI: * move udevice pointer into struct efi_object * fix efi_convert_device_path_to_text() Other: * fs/erofs: silence messages from erofs_probe()
Diffstat (limited to 'doc/develop/bootstd.rst')
-rw-r--r--doc/develop/bootstd.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/develop/bootstd.rst b/doc/develop/bootstd.rst
index b8773f8339d..f7fc7257076 100644
--- a/doc/develop/bootstd.rst
+++ b/doc/develop/bootstd.rst
@@ -21,7 +21,7 @@ feature is typically called `distro boot` (see :doc:`distro`) because it is
a way for distributions to boot on any hardware.
Traditionally U-Boot has relied on scripts to implement this feature. See
-disto_boodcmd_ for details. This is done because U-Boot has no native support
+distro_bootcmd_ for details. This is done because U-Boot has no native support
for scanning devices. While the scripts work remarkably well, they can be hard
to understand and extend, and the feature does not include tests. They are also
making it difficult to move away from ad-hoc CONFIGs, since they are implemented
@@ -52,7 +52,7 @@ BootLoaderSpec_ format. which looks something like this::
initrd /initramfs-5.3.7-301.fc31.armv7hl.img
As you can see it specifies a kernel, a ramdisk (initrd) and a directory from
-which to load devicetree files. The details are described in disto_boodcmd_.
+which to load devicetree files. The details are described in distro_bootcmd_.
The bootflow is provided by the distro. It is not part of U-Boot. U-Boot's job
is simply to interpret the file and carry out the instructions. This allows
@@ -669,7 +669,7 @@ Other ideas:
not need to specify things like `pxefile_addr_r`
-.. _disto_boodcmd: https://github.com/u-boot/u-boot/blob/master/include/config_distro_bootcmd.h
+.. _distro_bootcmd: https://github.com/u-boot/u-boot/blob/master/include/config_distro_bootcmd.h
.. _BootLoaderSpec: http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/
.. _distro_boot: https://github.com/u-boot/u-boot/blob/master/boot/distro.c
.. _bootflow_h: https://github.com/u-boot/u-boot/blob/master/include/bootflow.h