[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 1/1] docs/system: Move the RISC-V -bios information to removed
From: |
Alistair Francis |
Subject: |
[PATCH v1 1/1] docs/system: Move the RISC-V -bios information to removed |
Date: |
Tue, 4 May 2021 08:34:32 +1000 |
QEMU 5.1 changed the behaviour of the default boot for the RISC-V virt
and sifive_u machines. This patch moves that change from the
deprecated.rst file to the removed-features.rst file and the
target-riscv.rst.
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
docs/system/deprecated.rst | 19 -------------------
docs/system/removed-features.rst | 5 +++++
docs/system/target-riscv.rst | 13 ++++++++++++-
3 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index 80cae86252..dd83c95211 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -52,25 +52,6 @@ pcspk-audiodev=<name>``.
``tty`` and ``parport`` are aliases that will be removed. Instead, the
actual backend names ``serial`` and ``parallel`` should be used.
-RISC-V ``-bios`` (since 5.1)
-''''''''''''''''''''''''''''
-
-QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the
-RISC-V virt machine and sifive_u machine. QEMU 4.1 had no changes to the
-default behaviour to avoid breakages.
-
-QEMU 5.1 changes the default behaviour from ``-bios none`` to ``-bios
default``.
-
-QEMU 5.1 has three options:
- 1. ``-bios default`` - This is the current default behavior if no -bios option
- is included. This option will load the default OpenSBI firmware
automatically.
- The firmware is included with the QEMU release and no user interaction is
- required. All a user needs to do is specify the kernel they want to boot
- with the -kernel option
- 2. ``-bios none`` - QEMU will not automatically load any firmware. It is up
- to the user to load all the images they need.
- 3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmwrae.
-
Short-form boolean options (since 6.0)
''''''''''''''''''''''''''''''''''''''
diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
index 29e90601a5..747a763b37 100644
--- a/docs/system/removed-features.rst
+++ b/docs/system/removed-features.rst
@@ -126,6 +126,11 @@ devices. Drives the board doesn't pick up can no longer
be used with
This option was undocumented and not used in the field.
Use `-device usb-ccid`` instead.
+RISC-V firmware not booted by default (removed in 5.1)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+QEMU 5.1 changes the default behaviour from ``-bios none`` to ``-bios default``
+for the RISC-V ``virt`` machine and ``sifive_u`` machine.
QEMU Machine Protocol (QMP) commands
------------------------------------
diff --git a/docs/system/target-riscv.rst b/docs/system/target-riscv.rst
index 8d5946fbbb..0001c55fca 100644
--- a/docs/system/target-riscv.rst
+++ b/docs/system/target-riscv.rst
@@ -69,5 +69,16 @@ undocumented; you can get a complete list by running
riscv/microchip-icicle-kit
riscv/sifive_u
-RISC-V CPU features
+RISC-V CPU firmware
-------------------
+
+When using the ``sifive_u`` or ``virt`` machine there are three different
+firmware boot options:
+ 1. ``-bios default`` - This is the default behaviour if no -bios option
+ is included. This option will load the default OpenSBI firmware
automatically.
+ The firmware is included with the QEMU release and no user interaction is
+ required. All a user needs to do is specify the kernel they want to boot
+ with the -kernel option
+ 2. ``-bios none`` - QEMU will not automatically load any firmware. It is up
+ to the user to load all the images they need.
+ 3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmware.
--
2.31.1
- [PATCH v1 1/1] docs/system: Move the RISC-V -bios information to removed,
Alistair Francis <=