aboutsummaryrefslogtreecommitdiff
path: root/docs/system/arm/cpu-features.rst
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-03-09 21:58:18 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-03-12 11:20:20 +0000
commit6fe6d6c9a953901251e1a85088f0a61ff5caf648 (patch)
tree1a6fd6d7c792d6bcebe4313d1795f3b4c4eac047 /docs/system/arm/cpu-features.rst
parent34f18ab14d7197d13d7e93300e3b9a3853c7efc8 (diff)
docs: Be consistent about capitalization of 'Arm'pull-docs-20200312docs.nextdocs.for-upstream
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/system/arm/cpu-features.rst')
-rw-r--r--docs/system/arm/cpu-features.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/system/arm/cpu-features.rst b/docs/system/arm/cpu-features.rst
index 7495b7b672..2d5c06cd01 100644
--- a/docs/system/arm/cpu-features.rst
+++ b/docs/system/arm/cpu-features.rst
@@ -5,9 +5,9 @@ CPU features are optional features that a CPU of supporting type may
choose to implement or not. In QEMU, optional CPU features have
corresponding boolean CPU proprieties that, when enabled, indicate
that the feature is implemented, and, conversely, when disabled,
-indicate that it is not implemented. An example of an ARM CPU feature
+indicate that it is not implemented. An example of an Arm CPU feature
is the Performance Monitoring Unit (PMU). CPU types such as the
-Cortex-A15 and the Cortex-A57, which respectively implement ARM
+Cortex-A15 and the Cortex-A57, which respectively implement Arm
architecture reference manuals ARMv7-A and ARMv8-A, may both optionally
implement PMUs. For example, if a user wants to use a Cortex-A15 without
a PMU, then the `-cpu` parameter should contain `pmu=off` on the QEMU