Platform: Corstone310 directory reorg

Signed-off-by: Dávid Házi <david.hazi@arm.com>
Change-Id: I38e27c6d9b4dc68a9b15cbf3f0fe8d99b9608efc
diff --git a/docs/platform/arm/index.rst b/docs/platform/arm/index.rst
index 436518c..46fe123 100755
--- a/docs/platform/arm/index.rst
+++ b/docs/platform/arm/index.rst
@@ -8,7 +8,7 @@
     Corstone-1000 <corstone1000/readme.rst>
     Corstone-300 FPGA (AN547) <mps3/an547/README.rst>
     Corstone-300 FPGA and FVP (AN552) <mps3/an552/README.rst>
-    Corstone-310 FVP <mps3/corstone310_fvp/README.rst>
+    Corstone-310 FVP <mps3/corstone310/README.rst>
     Musca-B1 <musca_b1/readme.rst>
     Musca-S1 <musca_s1/readme.rst>
     Runtime Security Subsystem <rss/readme.rst>
diff --git a/docs/platform/arm/mps3/corstone310_fvp/README.rst b/docs/platform/arm/mps3/corstone310/README.rst
similarity index 97%
rename from docs/platform/arm/mps3/corstone310_fvp/README.rst
rename to docs/platform/arm/mps3/corstone310/README.rst
index 7b9f268..3ed9a52 100644
--- a/docs/platform/arm/mps3/corstone310_fvp/README.rst
+++ b/docs/platform/arm/mps3/corstone310/README.rst
@@ -16,14 +16,9 @@
 -------------
 
 Follow the instructions in :doc:`Building instructions </building/tfm_build_instruction>`.
-Build instructions with platform name: arm/mps3/corstone310_fvp
+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.
+``-DTFM_PLATFORM=arm/mps3/corstone310/fvp``
 
 .. note::
 
@@ -32,6 +27,11 @@
 
 .. note::
 
+   This platform support does not provide software for Ethos-U55 IP, only
+   contains base address and interrupt number for it.
+
+.. note::
+
    For Armclang compiler v6.18 or later version is required.
 
 To run the example code on Corstone-310 Ethos-U55 Arm Virtual Hardware
@@ -97,6 +97,6 @@
    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/releases/1.5.0.rst b/docs/releases/1.5.0.rst
index 06580b9..062bac9 100644
--- a/docs/releases/1.5.0.rst
+++ b/docs/releases/1.5.0.rst
@@ -43,7 +43,7 @@
 
   - :doc:`Corstone-1000 </platform/arm/corstone1000/readme>`
 
-  - :doc:`Corstone-Polaris </platform/arm/mps3/corstone310_fvp/README>`
+  - :doc:`Corstone-Polaris </platform/arm/mps3/corstone310/README>`
 
   - :doc:`B-U585I-IOT02A </platform/stm/b_u585i_iot02a/readme>`
 
@@ -122,4 +122,4 @@
 
 --------------
 
-*Copyright (c) 2021, Arm Limited. All rights reserved.*
+*Copyright (c) 2021-2022, Arm Limited. All rights reserved.*