Docs: Update Diadem related documentation
Change-Id: I4516cfa8124d82e3274ac482881b8c51519c8336
Signed-off-by: Gabor Abonyi <gabor.abonyi@arm.com>
diff --git a/platform/ext/platform_introduction.rst b/platform/ext/platform_introduction.rst
index ebb06c0..d134657 100644
--- a/platform/ext/platform_introduction.rst
+++ b/platform/ext/platform_introduction.rst
@@ -9,7 +9,12 @@
- Cortex-M55 system:
- `FPGA image loaded on MPS3 board (AN547).
- <https://developer.arm.com/products/system-design/development-boards/cortex-m-prototyping-systems/mps3>`_
+ <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`_
+ - `FPGA image loaded on MPS3 board (AN552).
+ <https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/download-fpga-images>`_
+ - `Corstone-300 Ethos-U55 Ecosystem FVP
+ <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`_
+
- Cortex-M33 system:
@@ -57,4 +62,4 @@
--------------
-*Copyright (c) 2017-2021, Arm Limited. All rights reserved.*
+*Copyright (c) 2017-2022, Arm Limited. All rights reserved.*
diff --git a/platform/ext/target/arm/mps3/an547/README.rst b/platform/ext/target/arm/mps3/an547/README.rst
index 40e65d8..8d0d61b 100644
--- a/platform/ext/target/arm/mps3/an547/README.rst
+++ b/platform/ext/target/arm/mps3/an547/README.rst
@@ -1,11 +1,12 @@
-Corstone-300 Ethos-U55 FPGA and FVP
-===================================
+Corstone SSE-300 with Ethos-U55 Example Subsystem for MPS3 (AN547)
+==================================================================
Building TF-M
-------------
Follow the instructions in :doc:`Building instructions </docs/technical_references/instructions/tfm_build_instruction>`.
-Build instructions with platform name: arm/mps3/an547 (-DTFM_PLATFORM=arm/mps3/an547).
+Build instructions with platform name: arm/mps3/an547
+``-DTFM_PLATFORM=arm/mps3/an547``
.. note::
@@ -14,9 +15,12 @@
.. note::
- The built binaries can be run on both the Corstone-300 Ethos-U55 Ecosystem
- FVP (FVP_SSE300_MPS3) and Corstone SSE-300 with Ethos-U55 Example Subsystem
- for MPS3 (AN547).
+ The built binaries can be run on the Corstone SSE-300 with Ethos-U55
+ Example Subsystem for MPS3 (AN547).
+ They can also be run on the Corstone-300 Ethos-U55 Ecosystem FVP
+ (FVP_SSE300_MPS3) up until version 11.15. From version 11.16, the FVP
+ is aligned with the AN552 FPGA platform. For build information check
+ :doc:`AN552 platform </platform/ext/target/arm/mps3/an552/README>`.
To run the example code on Corstone SSE-300 with Ethos-U55 Example Subsystem for MPS3 (AN547)
---------------------------------------------------------------------------------------------
@@ -63,9 +67,18 @@
[Crypto] Dummy Entropy NV Seed is not suitable for production!
Non-Secure system starting...
+.. note::
+
+ Some of the messages above are only visible when ``CMAKE_BUILD_TYPE`` is set
+ to ``Debug``.
+
To run the example code on Corstone-300 Ethos-U55 Ecosystem FVP
---------------------------------------------------------------
-FVP is available to download `here <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`__
+.. note::
+
+ The built binaries can be run on the Corstone-300 Ethos-U55 Ecosystem FVP
+ (FVP_SSE300_MPS3) up until version 11.15. This version is no longer
+ available to download.
#. Install the FVP
#. Copy ``bl2.axf`` and ``tfm_s_ns_signed.bin`` files from
@@ -90,6 +103,11 @@
[Crypto] Dummy Entropy NV Seed is not suitable for production!
Non-Secure system starting...
+.. note::
+
+ Some of the messages above are only visible when ``CMAKE_BUILD_TYPE`` is set
+ to ``Debug``.
+
-------------
-*Copyright (c) 2020-2021, Arm Limited. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited. All rights reserved.*
diff --git a/platform/ext/target/arm/mps3/an552/README.rst b/platform/ext/target/arm/mps3/an552/README.rst
index f8df989..746c7f9 100644
--- a/platform/ext/target/arm/mps3/an552/README.rst
+++ b/platform/ext/target/arm/mps3/an552/README.rst
@@ -1,5 +1,5 @@
-Corstone-300 Ethos-U55 FPGA and FVP
-===================================
+Corstone SSE-300 with Ethos-U55 Example Subsystem for MPS3 (AN552) and FVP
+==========================================================================
Building TF-M
-------------
@@ -17,7 +17,7 @@
The built binaries can be run on both the Corstone-300 Ethos-U55 Ecosystem
FVP (FVP_SSE300_MPS3) and Corstone SSE-300 with Ethos-U55 Example Subsystem
- for MPS3 (AN552).
+ for MPS3 (AN552). For the FVP, at least version 11.16 is required.
To run the example code on AN552
--------------------------------
@@ -64,6 +64,11 @@
[Crypto] Dummy Entropy NV Seed is not suitable for production!
Non-Secure system starting...
+.. note::
+
+ Some of the messages above are only visible when ``CMAKE_BUILD_TYPE`` is set
+ to ``Debug``.
+
To run the example code on Corstone-300 Ethos-U55 Ecosystem FVP
---------------------------------------------------------------
FVP is available to download `here <https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`__
@@ -73,7 +78,7 @@
build dir to ``<FVP installation path>/models/Linux64_GCC-6.4/``
#. Navigate to the same directory and execute the following command to start FVP::
- $ ./FVP_MPS3_Corstone_SSE-300 -a cpu0*="bl2.axf" --data "tfm_s_ns_signed.bin"@0x01000000
+ $ ./FVP_Corstone_SSE-300_Ethos-U55 -a cpu0*="bl2.axf" --data "tfm_s_ns_signed.bin"@0x01000000
#. After completing the procedure you should be able to visualize on the serial
port the following messages::
@@ -91,6 +96,11 @@
[Crypto] Dummy Entropy NV Seed is not suitable for production!
Non-Secure system starting...
+.. note::
+
+ Some of the messages above are only visible when ``CMAKE_BUILD_TYPE`` is set
+ to ``Debug``.
+
-------------
-*Copyright (c) 2020-2021, Arm Limited. All rights reserved.*
+*Copyright (c) 2020-2022, Arm Limited. All rights reserved.*