Update firmware version to v2.5.0

Update firmware version to v2.5.0 and update the
documentation for the release of SCP-Firmware v2.5.0

Change-Id: Icd977b1adbffb23c1690387162a21b4266b4ff29
Signed-off-by: Ronald Cron <ronald.cron@arm.com>

5 files changed, 188 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 613782a6..670c41ca 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
 # Version
 #
 export VERSION_MAJOR := 2
-export VERSION_MINOR := 4
+export VERSION_MINOR := 5
 export VERSION_PATCH := 0
 
 #
diff --git a/change_log.md b/change_log.md
index e23b95fd..e9c4c8fb 100644
--- a/change_log.md
+++ b/change_log.md
@@ -61,3 +61,69 @@ Known issues
   word or halfword accesses, this can result in hardware exceptions.
   [This patch](https://github.com/ARM-software/SCP-firmware/commit/d2a77e0d4d0d369f7504c032a380578a4d145438)
   fixes this issue.
+
+
+SCP-firmware - version 2.5.0
+============================
+
+New features
+------------
+
+- Modules:
+    - CMN600 support
+    - DMC620 support
+    - apcontext: New module to zero the AP context area
+
+- Platforms:
+    - Support for the SGI-575 platform
+    - Support for the Neoverse N1 reference design
+
+Note: Juno, Neoverse N1 SDP, Neoverse E1 reference design and SynQuacer products
+are NOT part of this release.
+
+Changed
+-------
+
+- Build System:
+    - Name firmware bin and elf file by the name of the firmware
+
+- Documentation:
+    - Emphasized that the order of the modules in the BS_FIRMWARE_MODULES list
+      in the firmware definition makefiles is the order in which the modules
+      are initialized, bound and started during the pre-runtime phase.
+    - Expand Doxygen use of param [out]
+    - Improve coding style and rules
+
+- Framework:
+    - Improve error codes and their documentation
+    - Add fwk_module_get_sub_element_count API
+    - Improve unit testing of fwk_module.c
+    - Replace base alignment reference type with `max_align_t`
+
+- Modules:
+    - sds: Make initialization deferring optional
+    - sds: Send notification once SDS is initialized
+    - scmi: Subscribe to SMT ready notifications and send notification when
+      service is initialized
+    - smt: Add logging on mailbox ownership error
+    - smt: Send notification when each SMT mailbox is initialized
+    - sid: Move to an always available interface
+    - system_power: Introduce platform interrupts and enable a configurable
+      number of system PPUs
+    - cmn600: Add the ccix programming for cmn600
+
+Resolved issues
+---------------
+
+- Build System:
+    - Disable generation of unaligned accesses
+
+- Framework:
+    - list: Always zero list nodes when removed from a list
+    - Zero event list node when duplicating an event
+
+- Modules:
+    - cmn600: Fix inappropriately-initialised global state
+    - cmn600: Stop checking type of external nodes
+    - ppu_v0: Ensure bound_id is set when bound by system_power
+    - system_power: Fix extented PPU support
diff --git a/framework/test/test_version.c b/framework/test/test_version.c
index 329299bd..6d214718 100644
--- a/framework/test/test_version.c
+++ b/framework/test/test_version.c
@@ -14,13 +14,13 @@
 static void test_version(void)
 {
     assert(BUILD_VERSION_MAJOR == 2);
-    assert(BUILD_VERSION_MINOR == 4);
+    assert(BUILD_VERSION_MINOR == 5);
     assert(BUILD_VERSION_PATCH == 0);
 }
 
 static void test_version_string(void)
 {
-    const char *result_string = "v2.4.0";
+    const char *result_string = "v2.5.0";
 
     assert(strcmp(BUILD_VERSION_STRING, result_string) == 0);
 }
diff --git a/readme.md b/readme.md
index 8233d308..e57847f5 100644
--- a/readme.md
+++ b/readme.md
@@ -56,7 +56,9 @@ Platforms
 Various builds of the release have been tested on the following ARM Fixed
 Virtual Platforms (FVPs):
 
-- System Guidance for Mobile platform SGM-775 (Version 11.1 Build 30)
+- System Guidance for Mobile platform SGM-775 (Version 11.3 Build 42)
+- System Guidance for Infrastruture SGI-575 (Version 11.3 Build 42)
+- Neoverse N1 reference design (Version 11.6 Build 45)
 
 License
 -------
diff --git a/user_guide.md b/user_guide.md
index 05376850..4c16c114 100644
--- a/user_guide.md
+++ b/user_guide.md
@@ -121,33 +121,33 @@ refer to [System Guidance for Mobile (SGM)](https://community.arm.com/dev-platfo
 
 The build system generates the list of firmware images as defined by the
 product.mk file associated with the product. For SGM platforms, two firmware
-images are built, referred to as 'scp_romfw' and 'scp_ramfw' below.
+images are built: scp_romfw.bin and scp_ramfw.bin.
 
-The scp_romfw firmware image exists in the ROM of the system. It is the first
-firmware image executed when booting an SGM platform. It does the minimal setup
-and initialization of the system, and powers on the primary application core.
-Then, it waits for the primary core to load the scp_ramfw image into secure RAM
-before handing over execution to it.
+The scp_romfw.bin firmware image exists in the ROM of the system. It is the
+first firmware image executed when booting an SGM platform. It does the minimal
+setup and initialization of the system, and powers on the primary application
+core. Then, it waits for the primary core to load the scp_ramfw.bin image into
+secure RAM before handing over execution to it.
 
-The scp_ramfw firmware image provides all the runtime services delegated to the
-SCP as a part of the system. It is loaded by the primary core and not the
-scp_romfw firmware to leverage the processing power of the application processor
-for image authentication.
+The scp_ramfw.bin firmware image provides all the runtime services delegated to
+the SCP as a part of the system. It is loaded by the primary core and not the
+scp_romfw.bin firmware to leverage the processing power of the application
+processor for image authentication.
 
-In order for the scp_ramfw firmware image to be loaded per the boot flow
+In order for the scp_ramfw.bin firmware image to be loaded per the boot flow
 described above, a minimal application processor firmware needs to be available.
 This typically consists of at least two images:
 
 - bl1: First-stage bootloader stored in the system ROM
 - bl2: Second-stage bootloader loaded by bl1, responsible for loading the
-    scp_ramfw firmware image and other application processor firmware images
+    scp_ramfw.bin firmware image and other application processor firmware images
     into system RAM
 
 For more information about application processor firmware images and how to
-build them, please refer to the [Arm Trusted Firmware-A user guide](https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/user-guide.rst).
+build them, please refer to the [Arm Trusted Firmware-A user guide](https://github.com/ARM-software/arm-trusted-firmware/blob/master/docs/getting_started/user-guide.rst).
 
-In order for the bl2 firmware image and the scp_ramfw firmware image to be made
-available to their respective loaders, they must be packaged in a Firmware
+In order for the bl2 firmware image and the scp_ramfw.bin firmware image to be
+made available to their respective loaders, they must be packaged in a Firmware
 Image Package (FIP). Please refer to the Arm Trusted Firmware-A user guide for
 instructions on building FIP packages.
 
@@ -156,7 +156,7 @@ To run the boot flow described above on an SGM platform FVP, use:
     $> <path to the SGM platform FVP> \
         -C soc.pl011_uart0.out_file=./ap.txt \
         -C soc.pl011_uart1.out_file=./scp.txt \
-        -C css.scp.ROMloader.fname=<path to scp_romfw firmware image> \
+        -C css.scp.ROMloader.fname=<path to scp_romfw.bin firmware image> \
         -C css.trustedBootROMloader.fname=<path to bl1 firmware image> \
         -C board.flashloader0.fname=<path to FIP> \
         -C soc.pl011_uart1.unbuffered_output=1 \
@@ -169,6 +169,106 @@ Note:
         [Arm Platforms deliverables](https://community.arm.com/dev-platforms/w/docs/304/arm-platforms-deliverables).
         See the following section.
 
+Running the SCP/MCP firmware on System Guidance for Infrastructure platforms
+----------------------------------------------------------------------------
+
+For an introduction to the System Guidance for Infrastructure (SGI) platforms,
+please refer to [System Guidance for Infrastructure (SGI)](https://community.arm.com/developer/tools-software/oss-platforms/w/docs/387/system-guidance-for-infrastructure-sgi).
+
+The build system generates the list of firmware images as defined by the
+product.mk file associated with the product. For SGI platforms, three firmware
+images are built: scp_romfw.bin, mcp_romfw.bin and scp_ramfw.bin.
+
+The scp_romfw.bin and mcp_romfw.bin firmware images exist in the ROM of the
+system. They are the first firmware images executed when booting an SGI
+platform.
+
+The scp_romfw.bin image does the minimal setup and initialization of the system
+and then loads from the flash the scp_ramfw.bin image into secure RAM before
+handing over execution to it.
+
+The scp_ramfw.bin firmware image provides all the runtime services delegated to
+the SCP as a part of the system.
+
+The mcp_romfw.bin image initializes the MCP.
+
+To run the boot flow described above on an SGI platform FVP, use:
+
+    $> <path to the SGI platform FVP> \
+        -C css.scp.pl011_uart_scp.out_file=./scp.txt \
+        -C css.mcp.pl011_uart0_mcp.out_file=./mcp.txt \
+        -C css.scp.ROMloader.fname=<path to scp_romfw.bin firmware image> \
+        -C board.flashloader0.fname=<path to nor.bin file (see below)> \
+        -C css.mcp.ROMloader.fname=<path to mcp_romfw.bin firmware image> \
+        -C css.mcp.pl011_uart0_mcp.unbuffered_output=1 \
+        -C css.scp.pl011_uart_scp.unbuffered_output=1
+
+Note:
+    - SGI platform FVPs are available on
+        [the Fixed Virtual Platforms product page](https://developer.arm.com/products/system-design/fixed-virtual-platforms).
+    - The scp_romfw.bin image expects the scp_ramfw.bin image to be located at
+      the offset 0x03D80000 in the NOR flash. The content of the NOR flash is
+      passed to the model as a nor.bin binary file. The nor.bin file can be
+      build in the current working directory as follow:
+
+      $> dd if=/dev/zero of=nor.bin bs=1024 count=62976
+      $> cat <path to scp_ramfw.bin image> >> nor.bin
+
+      The first command creates a nor.bin file of size 0x3D80000 filed in with
+      zeroes. The second command appends the scp_ramfw.bin image to the nor.bin
+      file.
+
+Running the SCP/MCP firmware on Neoverse reference designs
+----------------------------------------------------------
+
+For an introduction to the Neoverse reference designs,
+please refer to [Neoverse reference designs](https://community.arm.com/developer/tools-software/oss-platforms/w/docs/443/neoverse-reference-designs).
+
+The build system generates the list of firmware images as defined by the
+product.mk file associated with the product. For Neoverse reference designs,
+three firmware images are built: scp_romfw.bin, mcp_romfw.bin and
+scp_ramfw.bin.
+
+The scp_romfw.bin and mcp_romfw.bin firmware image exist in the ROM of the
+system. They are the first firmware images executed when booting a Neoverse
+reference design.
+
+The scp_romfw.bin image does the minimal setup and initialization of the system
+and then loads the scp_ramfw.bin image into secure RAM before handing over
+execution to it.
+
+The scp_ramfw.bin firmware image provides all the runtime services delegated to
+the SCP as a part of the system.
+
+The mcp_romfw.bin image initializes the MCP.
+
+To run the boot flow described above on an Neoverse reference design FVP, use:
+
+    $> <path to the Neoverse reference design FVP> \
+        -C css.scp.pl011_uart_scp.out_file=./scp.txt \
+        -C css.mcp.pl011_uart0_mcp.out_file=./mcp.txt \
+        -C css.scp.ROMloader.fname=<path to scp_romfw.bin firmware image> \
+        -C board.flashloader0.fname=<path to nor.bin file (see below)> \
+        -C css.mcp.ROMloader.fname=<path to mcp_romfw.bin firmware image> \
+        -C css.mcp.pl011_uart0_mcp.unbuffered_output=1 \
+        -C css.scp.pl011_uart_scp.unbuffered_output=1
+
+Note:
+    - Neoverse reference designs FVPs are available on
+        [the Fixed Virtual Platforms product page](https://developer.arm.com/products/system-design/fixed-virtual-platforms).
+
+    - The scp_romfw.bin image expects the scp_ramfw.bin image to be located at
+      the offset 0x03D80000 in the NOR flash. The content of the NOR flash is
+      passed to the model as a nor.bin binary file. The nor.bin file can be
+      build in the current working directory as follow:
+
+      $> dd if=/dev/zero of=nor.bin bs=1024 count=62976
+      $> cat <path to scp_ramfw.bin image> >> nor.bin
+
+      The first command creates a nor.bin file of size 0x3D80000 filed in with
+      zeroes. The second command appends the scp_ramfw.bin image to the nor.bin
+      file.
+
 Booting up to the Linux prompt on Arm platforms
 -----------------------------------------------