diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-04-15 14:01:59 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-04-15 14:01:59 +0200 |
commit | af0f068a6edad45b033e772056ac0352e1ba3613 (patch) | |
tree | 3de6134592f7766060176933b5b53ca2d09057f9 /Documentation | |
parent | b463adfd95354b4603544215eada98284f2be090 (diff) | |
parent | e2f7b1d9aca31328499ed4b3df344d96b0ccbd1e (diff) | |
download | barebox-af0f068a6edad45b033e772056ac0352e1ba3613.tar.gz barebox-af0f068a6edad45b033e772056ac0352e1ba3613.tar.xz |
Merge branch 'for-next/virtio'
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/boards/riscv.rst | 2 | ||||
-rw-r--r-- | Documentation/user/virtio.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/boards/riscv.rst b/Documentation/boards/riscv.rst index 049029b4f2..59cdc00a99 100644 --- a/Documentation/boards/riscv.rst +++ b/Documentation/boards/riscv.rst @@ -9,7 +9,7 @@ barebox supports both the qemu riscv32 and riscv64 ``-M virt`` boards:: make ARCH=riscv virt64_defconfig qemu-system-riscv64 -M virt -serial stdio -kernel build/images/barebox-dt-2nd.img -Replace ``64`` by ``32`` for 32-bit build. :ref:`virtio` over MMIO is supported and +Replace ``64`` by ``32`` for 32-bit build. :ref:`virtio_sect` over MMIO is supported and can be used for e.g. an extra console or to pass in a virtio-blk device:: qemu-system-riscv64 -M virt -serial stdio \ diff --git a/Documentation/user/virtio.rst b/Documentation/user/virtio.rst index 7e125c0ca8..dde47d5f82 100644 --- a/Documentation/user/virtio.rst +++ b/Documentation/user/virtio.rst @@ -4,7 +4,7 @@ Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> Copyright (C) 2021, Ahmad Fatoum -.. _virtio: +.. _virtio_sect: VirtIO Support ============== @@ -35,7 +35,7 @@ queues configuration and buffer transfers are nearly identical. Both MMIO and non-legacy PCI are supported in barebox. The VirtIO spec defines a lots of VirtIO device types, however at present only -block, console and RNG devices are supported. +block, console, input and RNG devices are supported. Build Instructions ------------------ |