commit f46fd8825e051e4fba6d7e6534bffa370525d625
author joanna.farley <joanna.farley@arm.com> Thu Apr 16 07:12:39 2020 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Thu Apr 16 07:12:39 2020 +0000
tree c0544fbaf4df0ba07e409e9c1f939316ce01e6c1
parent 96c47ed800cb9e18ef0dd0633caa19d83975d6e2
parent 489645f8948ac8694027e84ce574918135666104

Merge "docs: Updating Release information for v2.4" into integration

docs/about/release-information.rst

diff --git a/docs/about/release-information.rst b/docs/about/release-information.rst
index fb1e39b..f3167fb 100644
--- a/docs/about/release-information.rst
+++ b/docs/about/release-information.rst
@@ -42,6 +42,8 @@
 +-----------------+---------------------------+------------------------------+
 | v2.3            | 4th week of Apr '20       | 1st week of Apr '20          |
 +-----------------+---------------------------+------------------------------+
+| v2.4            | 4th week of Oct '20       | 1st week of Oct '20          |
++-----------------+---------------------------+------------------------------+
 
 Removal of Deprecated Interfaces
 --------------------------------
@@ -59,9 +61,6 @@
 +--------------------------------+-------------+---------+---------------------------------------------------------+
 | ``__ASSEMBLY__`` macro         | Oct '19     | v2.3    | Deprecated in favor of ``__ASSEMBLER__``                |
 +--------------------------------+-------------+---------+---------------------------------------------------------+
-| Prototype SPCI-based SPM       | Oct '19     | v2.2    | Based on outdated Alpha 1 spec. Will be replaced with   |
-| (services/std_svc/spm)         |             |         | alternative methods of secure partitioning support.     |
-+--------------------------------+-------------+---------+---------------------------------------------------------+
 
 --------------