Platform: Rename Polaris to Corstone-310
Changed Corstone Polaris to Corstone-310 and
Olympus to Cortex-M85. Updated the README.rst.
Change-Id: I1a2821664252fa40f53b4f92fcb437bb4a187efc
Signed-off-by: Bence Balogh <bence.balogh@arm.com>
diff --git a/docs/platform/ext/platform_introduction.rst b/docs/platform/ext/platform_introduction.rst
index be7e268..ae03d62 100644
--- a/docs/platform/ext/platform_introduction.rst
+++ b/docs/platform/ext/platform_introduction.rst
@@ -2,9 +2,10 @@
Supported Platforms
###################
- - Olympus system
+ - Cortex-M85 system:
- - Corstone-Polaris Ethos-U55 FVP (Olympus CPU plus Ethos-U55)
+ - `Corstone-310 Ethos-U55 FVP.
+ <https://arm-software.github.io/AVH/main/simulation/html/Using.html>`_
- Cortex-M55 system:
@@ -12,7 +13,7 @@
<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
+ - `Corstone-300 Ethos-U55 Ecosystem FVP.
<https://developer.arm.com/tools-and-software/open-source-software/arm-platforms-software/arm-ecosystem-fvps>`_
diff --git a/docs/platform/ext/target/arm/mps3/corstone310_fvp/README.rst b/docs/platform/ext/target/arm/mps3/corstone310_fvp/README.rst
new file mode 100644
index 0000000..d619bfc
--- /dev/null
+++ b/docs/platform/ext/target/arm/mps3/corstone310_fvp/README.rst
@@ -0,0 +1,99 @@
+Corstone SSE-310 with Ethos-U55 Example Subsystem for Arm Virtual Hardware
+==========================================================================
+
+Introduction
+------------
+
+Corstone-310 (formerly Corstone-Polaris) is an Arm reference subsystem for
+secure System on Chips containing an Armv8.1-M Cortex-M85 processor and an
+Ethos-U55 neural network processor. It is an MPS3 based platform with the
+usual MPS3 peripherals.
+
+This platform port supports all TF-M regression tests (Secure and Non-secure)
+with Isolation Level 1 and 2.
+
+Building TF-M
+-------------
+
+Follow the instructions in :doc:`Building instructions </technical_references/instructions/tfm_build_instruction>`.
+Build instructions with platform name: arm/mps3/corstone310_fvp
+
+``-DTFM_PLATFORM=arm/mps3/corstone310_fvp``
+
+.. note::
+
+ This platform support does not provide software for Ethos-U55 IP, only
+ contains base address and interrupt number for it.
+
+.. note::
+
+ The built binaries can be run on the Corstone-310 Arm Virtual Hardware
+ (VHT_Corstone_SSE-310). At least VHT version 11.17 is required.
+
+
+To run the example code on Corstone-310 Ethos-U55 Arm Virtual Hardware
+----------------------------------------------------------------------
+
+To utilize the `Arm Virtual Hardware (AVH) <https://arm-software.github.io/AVH/main/simulation/html/Using.html>`_, you will need to create an `AWS Account <https://aws.amazon.com/>`_ if you don’t already have one.
+
+Launching the instance in EC2 `(AWS on getting started) <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EC2_GetStarted.html>`_
+1. Go to `EC2 <https://console.aws.amazon.com/ec2/v2/>`_ in the AWS Web Console.
+2. Select **Launch Instances** which will take you to a wizard for launching the instance.
+
+ 1. **Choose an Amazon Machine Image** `(AMI) <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AMIs.html>`_ In the Search box, type `Arm Virtual Hardware` then find the item called "Arm Virtual Hardware" that is by Arm, and press Select for that item.
+ This will raise a subscription page/pop-up titled, **Arm Virtual Hardware**. You will note that the subscription is free from Arm, but AWS does charge for the costs of the instances themselves according to the pricing chart provided.
+
+ You must select Continue if you want to move forward.
+
+ 2. **Choose an Instance Type** - Select one of the instance types from the list. Keep in mind that there are charges that accrue while the instance is running.
+ From here you may select **Review and Launch** to move directly to the launch page or select **Next: Configure Instance Details** if you need to set any custom settings for this instance.
+
+
+Once you complete the wizard by initiating the instance launch you will see a page that allows you to navigate directly to the new instance. You may click this link or go back to your list of instances and find the instance through that method.
+
+Whichever way you choose find your new instance and select its instance ID to open the page to manage the instance.
+
+Connecting to the instance:
+ 1. Select **Connect** to open an SSH terminal session to the instance in your browser.
+ 2. Ensure the **User name** field is set to `ubuntu`.
+ 3. Select the **Connect** button to open the session. This will put you in a browser window where you will have an SSH terminal window ready for your input.
+
+The TF-M can be cloned and built in the instance after connecting.
+To run the built binaries:
+
+#. Execute the following command to start VHT::
+
+ $ VHT_Corstone_SSE-310 -a cpu0*="<path-to-build-directory>/bl2.axf" --data "<path-to-build-directory>/tfm_s_ns_signed.bin"@0x01040000
+
+#. The serial port's output can be redirected to a file with::
+
+ $ VHT_Corstone_SSE-310 -a cpu0*="<path-to-build-directory>/bl2.axf" --data "<path-to-build-directory>/tfm_s_ns_signed.bin"@0x01040000 -C mps3_board.uart0.unbuffered_output=1 -C mps3_board.uart0.out_file="output.log"
+
+ The output should contain the following messages::
+
+ Trying 127.0.0.1...
+ Connected to localhost.
+ Escape character is '^]'.
+ [INF] Starting bootloader
+ [INF] Beginning BL2 provisioning
+ [INF] Swap type: none
+ [INF] Swap type: none
+ [INF] Bootloader chainload address offset: 0x40000
+ [INF] Jumping to the first image slot
+ [INF] Beginning TF-M provisioning
+ [Sec Thread] Secure image initializing!
+ TF-M isolation level is:0x00000001
+ Booting TF-M v1.6.0
+ Creating an empty ITS flash layout.
+ Creating an empty PS flash layout.
+ Non-Secure system starting...
+
+
+.. note::
+
+ Some of the messages above are only visible when ``CMAKE_BUILD_TYPE`` is set
+ to ``Debug``.
+
+-------------
+
+*Copyright (c) 2021-2022, Arm Limited. All rights reserved.*
diff --git a/docs/platform/ext/target/arm/mps3/corstone_polaris/README.rst b/docs/platform/ext/target/arm/mps3/corstone_polaris/README.rst
deleted file mode 100644
index 2663c40..0000000
--- a/docs/platform/ext/target/arm/mps3/corstone_polaris/README.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-Corstone-Polaris
-================
-
-Introduction
-------------
-
-Corstone-Polaris is an Arm reference subsystem for secure System on
-Chips containing an Armv8.1-M Olympus processor and an Ethos-U55 neural
-network processor. It is an MPS3 based platform with the usual MPS3
-peripherals.
-
-This platform port supports all TF-M regression tests (Secure and Non-secure)
-with Isolation Level 1 and 2, but building without BL2 is not supported.
-
-Building TF-M
--------------
-
-Follow the instructions in :doc:`Building instructions </technical_references/instructions/tfm_build_instruction>`.
-Build instructions with platform name: arm/mps3/corstone_polaris (-DTFM_PLATFORM=arm/mps3/corstone_polaris).
-
-*Copyright (c) 2021, Arm Limited. All rights reserved.*
diff --git a/docs/releases/1.5.0.rst b/docs/releases/1.5.0.rst
index af2a52b..1d3bb9f 100644
--- a/docs/releases/1.5.0.rst
+++ b/docs/releases/1.5.0.rst
@@ -43,7 +43,7 @@
- :doc:`Corstone-1000 </platform/ext/target/arm/corstone1000/readme>`
- - :doc:`Corstone-Polaris </platform/ext/target/arm/mps3/corstone_polaris/README>`
+ - :doc:`Corstone-Polaris </platform/ext/target/arm/mps3/corstone310_fvp/README>`
- :doc:`B-U585I-IOT02A </platform/ext/target/stm/b_u585i_iot02a/readme>`
diff --git a/docs/technical_references/design_docs/tfm_secure_boot.rst b/docs/technical_references/design_docs/tfm_secure_boot.rst
index 7b2f745..fd4c0bf 100644
--- a/docs/technical_references/design_docs/tfm_secure_boot.rst
+++ b/docs/technical_references/design_docs/tfm_secure_boot.rst
@@ -234,7 +234,7 @@
+---------------------+-----------------+---------------+----------+----------------+--------------+
| FVP_SSE300_MPS3 | No | Yes | Yes | Yes | No |
+---------------------+-----------------+---------------+----------+----------------+--------------+
-| Corstone-Polaris | NO | Yes | Yes | Yes | No |
+| Corstone-310 FVP | Yes | Yes | Yes | Yes | No |
+---------------------+-----------------+---------------+----------+----------------+--------------+
| LPC55S69 | Yes | Yes | No | Yes | No |
+---------------------+-----------------+---------------+----------+----------------+--------------+