aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-03-09 21:58:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-03-12 11:20:20 +0000
commit34f18ab14d7197d13d7e93300e3b9a3853c7efc8 (patch)
tree44fb3dfe81d8de958e4979786e2f1cd7e2603bd9
parentd3149c590da27793e3ae279aa5fb63ab13bc0bde (diff)
downloadqemu-arm-34f18ab14d7197d13d7e93300e3b9a3853c7efc8.tar.gz
docs: Move arm-cpu-features.rst into the system manual
Now we have somewhere to put arm-specific rst documentation, we can move arm-cpu-features.rst from the docs/ top level directory into docs/system/arm/. 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-5-peter.maydell@linaro.org
-rw-r--r--docs/system/arm/cpu-features.rst (renamed from docs/arm-cpu-features.rst)8
-rw-r--r--docs/system/target-arm.rst6
2 files changed, 7 insertions, 7 deletions
diff --git a/docs/arm-cpu-features.rst b/docs/system/arm/cpu-features.rst
index fc1623aeca..7495b7b672 100644
--- a/docs/arm-cpu-features.rst
+++ b/docs/system/arm/cpu-features.rst
@@ -1,11 +1,5 @@
+Arm CPU Features
================
-ARM CPU Features
-================
-
-Examples of probing and using ARM CPU features
-
-Introduction
-============
CPU features are optional features that a CPU of supporting type may
choose to implement or not. In QEMU, optional CPU features have
diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst
index 86ea6f2f56..1425bd5303 100644
--- a/docs/system/target-arm.rst
+++ b/docs/system/target-arm.rst
@@ -78,3 +78,9 @@ undocumented; you can get a complete list by running
arm/stellaris
arm/musicpal
arm/sx1
+
+Arm CPU features
+================
+
+.. toctree::
+ arm/cpu-features