commit f378efd97169f9b668286973f291ba47142f07a4
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Tue Jul 13 14:58:48 2021 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Jul 13 14:58:48 2021 +0200
tree 57ac951a20fdc414325bb7038a0a865cac581e15
parent 2fd868be293dac70783857dafcfe1f368c9b933e
parent cdfd638a697b5b6f822eb785e3779072481da3f3

Merge "docs: update supported FVP models as per release 11.15.14" into integration

docs/plat/arm/fvp/index.rst

diff --git a/docs/plat/arm/fvp/index.rst b/docs/plat/arm/fvp/index.rst
index 710043e..d41982f 100644
--- a/docs/plat/arm/fvp/index.rst
+++ b/docs/plat/arm/fvp/index.rst
@@ -12,7 +12,7 @@
 (64-bit host machine only).
 
 .. note::
-   The FVP models used are Version 11.14 Build 21, unless otherwise stated.
+   The FVP models used are Version 11.15 Build 14, unless otherwise stated.
 
 -  ``FVP_Base_AEMvA``
 -  ``FVP_Base_AEMv8A-AEMv8A``
@@ -39,7 +39,7 @@
 -  ``FVP_Base_Cortex-A76AEx8``
 -  ``FVP_Base_Cortex-A77x4``
 -  ``FVP_Base_Cortex-A78x4``
--  ``FVP_Base_Matterhornx4``
+-  ``FVP_Base_Cortex-A710x4``
 -  ``FVP_Morello``         (Version 0.10 build 542)
 -  ``FVP_Base_Neoverse-E1x1``
 -  ``FVP_Base_Neoverse-E1x2``