aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Dykes <mark.dykes@arm.com>2021-05-26 20:02:36 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-05-26 20:02:36 +0200
commitfa4718031ae25bd17ea3a7b2d388e38ba5c4555a (patch)
tree61477604f265d405a942a73df40539f3cc6b8527
parent8d4aa7d95b53f707ce5094493f94e184094a886c (diff)
parent481c7b6b9107a3f71ee750f89cacdd8f9c729838 (diff)
downloadtrusted-firmware-a-fa4718031ae25bd17ea3a7b2d388e38ba5c4555a.tar.gz
Merge "fix(docs): fix typos in v2.5 release documentation" into integration
-rw-r--r--docs/change-log.rst2
-rw-r--r--docs/getting_started/prerequisites.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/change-log.rst b/docs/change-log.rst
index 4e7c96f6a2..9c475689a9 100644
--- a/docs/change-log.rst
+++ b/docs/change-log.rst
@@ -107,7 +107,7 @@ New Features
- Cortex_A78C CPU
- Makalu ELP CPU
- Makalu CPU
- - Matterhorn CPU
+ - Matterhorn ELP CPU
- Neoverse-N2 CPU
- CPU Errata
diff --git a/docs/getting_started/prerequisites.rst b/docs/getting_started/prerequisites.rst
index d116ce1e6b..7eea22f8e9 100644
--- a/docs/getting_started/prerequisites.rst
+++ b/docs/getting_started/prerequisites.rst
@@ -26,7 +26,7 @@ Toolchain
|TF-A| can be built with any of the following *cross-compiler* toolchains that
target the Armv7-A or Armv8-A architectures:
-- GCC >= 9.2-2019.12 (from the `Arm Developer website`_)
+- GCC >= 10.2-2020.11 (from the `Arm Developer website`_)
- Clang >= 4.0
- Arm Compiler >= 6.0