diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-09 21:58:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-03-12 11:20:20 +0000 |
| commit | 6fe6d6c9a953901251e1a85088f0a61ff5caf648 (patch) | |
| tree | 1a6fd6d7c792d6bcebe4313d1795f3b4c4eac047 /docs/specs | |
| parent | 34f18ab14d7197d13d7e93300e3b9a3853c7efc8 (diff) | |
| download | qemu-6fe6d6c9a953901251e1a85088f0a61ff5caf648.zip qemu-6fe6d6c9a953901251e1a85088f0a61ff5caf648.tar.gz qemu-6fe6d6c9a953901251e1a85088f0a61ff5caf648.tar.bz2 | |
docs: Be consistent about capitalization of 'Arm'
The company 'Arm' went through a rebranding some years back
involving a recapitalization from 'ARM' to 'Arm'. As a result
our documentation is a bit inconsistent between the two forms.
It's not worth trying to update everywhere in QEMU, but it's
easy enough to make docs/ consistent.
Note that "ARMv8" and similar architecture names, and
older CPU names like "ARM926" still retain all-caps.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Message-id: 20200309215818.2021-6-peter.maydell@linaro.org
Diffstat (limited to 'docs/specs')
| -rw-r--r-- | docs/specs/fw_cfg.txt | 2 | ||||
| -rw-r--r-- | docs/specs/tpm.rst | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/specs/fw_cfg.txt b/docs/specs/fw_cfg.txt index 08c00bd..8f1ebc6 100644 --- a/docs/specs/fw_cfg.txt +++ b/docs/specs/fw_cfg.txt @@ -82,7 +82,7 @@ Selector Register IOport: 0x510 Data Register IOport: 0x511 DMA Address IOport: 0x514 -=== ARM Register Locations === +=== Arm Register Locations === Selector Register address: Base + 8 (2 bytes) Data Register address: Base + 0 (8 bytes) diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index da9eb39..5e61238 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -25,7 +25,7 @@ QEMU files related to TPM TIS interface: Both an ISA device and a sysbus device are available. The former is used with pc/q35 machine while the latter can be instantiated in the -ARM virt machine. +Arm virt machine. CRB interface ------------- @@ -331,7 +331,7 @@ In case a pSeries machine is emulated, use the following command line: -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0 \ -drive file=test.img,format=raw,if=none,id=drive-virtio-disk0 -In case an ARM virt machine is emulated, use the following command line: +In case an Arm virt machine is emulated, use the following command line: .. code-block:: console @@ -346,7 +346,7 @@ In case an ARM virt machine is emulated, use the following command line: -drive if=pflash,format=raw,file=flash0.img,readonly \ -drive if=pflash,format=raw,file=flash1.img - On ARM, ACPI boot with TPM is not yet supported. + On Arm, ACPI boot with TPM is not yet supported. In case SeaBIOS is used as firmware, it should show the TPM menu item after entering the menu with 'ESC'. |