Hi Simon, Thank you for the patch.
On mar., juil. 16, 2024 at 08:04, Simon Glass <s...@chromium.org> wrote: > Add documentation for the qfw bootmeth. > > Fix up the compatible string to drop the 'extlinux' part, which is not > relevant to this bootmeth. > > Signed-off-by: Simon Glass <s...@chromium.org> > Reviewed-by: Quentin Schulz <quentin.sch...@cherry.de> > --- > > Changes in v2: > - Adjustments from Heinrich's comments > > boot/bootmeth_qfw.c | 2 +- > doc/develop/bootstd/index.rst | 1 + > doc/develop/bootstd/overview.rst | 1 + > doc/develop/bootstd/qfw.rst | 20 ++++++++++++++++++++ > 4 files changed, 23 insertions(+), 1 deletion(-) > create mode 100644 doc/develop/bootstd/qfw.rst > > diff --git a/boot/bootmeth_qfw.c b/boot/bootmeth_qfw.c > index dfaa944594e..2f8e00cf350 100644 > --- a/boot/bootmeth_qfw.c > +++ b/boot/bootmeth_qfw.c > @@ -88,7 +88,7 @@ static struct bootmeth_ops qfw_bootmeth_ops = { > }; > > static const struct udevice_id qfw_bootmeth_ids[] = { > - { .compatible = "u-boot,qfw-extlinux" }, > + { .compatible = "u-boot,qfw-bootmeth" }, > { } > }; > > diff --git a/doc/develop/bootstd/index.rst b/doc/develop/bootstd/index.rst > index 5052afe448f..f8fce7207ce 100644 > --- a/doc/develop/bootstd/index.rst > +++ b/doc/develop/bootstd/index.rst > @@ -9,3 +9,4 @@ Standard Boot > overview > extlinux > pxelinux > + qfw > diff --git a/doc/develop/bootstd/overview.rst > b/doc/develop/bootstd/overview.rst > index b9b45f1e7a7..f23e344546d 100644 > --- a/doc/develop/bootstd/overview.rst > +++ b/doc/develop/bootstd/overview.rst > @@ -418,6 +418,7 @@ Bootmeth drivers are provided for booting from various > media: > - EFI boot using bootefi from disk > - VBE > - EFI boot using boot manager > + - :doc:`QFW <qfw>`: QEMU firmware interface > > Each driver is controlled by a Kconfig option. If no bootmeth driver is > selected by a compatible string in the devicetree, all available bootmeth > diff --git a/doc/develop/bootstd/qfw.rst b/doc/develop/bootstd/qfw.rst > new file mode 100644 > index 00000000000..b2ff1364fd8 > --- /dev/null > +++ b/doc/develop/bootstd/qfw.rst > @@ -0,0 +1,20 @@ > +.. SPDX-License-Identifier: GPL-2.0+: > + > +QFW Bootmeth > +============ > + > +`QEMU <hhttps://www.qemu.org/>`_ is a system emulator which is able to boot > +Operating Systems. QEMU provides specific support for booting an OS image > +provided on the QEMU command line. > + > +When invoked on a bootdev for UCLASS_QFW, this bootmeth reads the kernel > +provided by the QEMU `-kernel` argument, the initial ramdisk and provided by There is a "and" which should be removed here: ramdisk and provided by -> ramdisk provided by With that fixed: Reviewed-by: Mattijs Korpershoek <mkorpersh...@baylibre.com> > +`-initrd` and the boot arguments (command line) provided by `-append` into > +memory ready for booting. > + > +When the bootflow is booted, the bootmeth tries the `booti` command first, > then > +falls back to the `bootz` command. U-Boot's 'control' devicetree is passed > +through to the kernel. > + > +The compatible string "u-boot,qfw-bootmeth" is used for the driver. It is > +present if `CONFIG_QFW` is enabled. > -- > 2.34.1