diff --git a/CMakeLists.txt b/CMakeLists.txt
index 973ad5a74b8c3120892ae51cc0b60330d4f7589a..f6ac876a25c107f5062a875daa898502aae34978 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ endif()
project(
SCP
- VERSION 2.8.0
+ VERSION 2.9.0
DESCRIPTION "Arm SCP/MCP Software"
HOMEPAGE_URL
"https://developer.arm.com/tools-and-software/open-source-software/firmware/scp-firmware"
diff --git a/Makefile b/Makefile
index 980df99d57bdb655b4e7e49f05c352cf234052cb..2b4a5903ebc0d61edc36710b74c5c1d2e7981351 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
# Version
#
export VERSION_MAJOR := 2
-export VERSION_MINOR := 8
+export VERSION_MINOR := 9
export VERSION_PATCH := 0
#
diff --git a/change_log.md b/change_log.md
index b466d282ecf24666fc46f1d3acde16e4c6874a52..7b3e0b3f46997a5668144cbb21b80c9b427a0658 100644
--- a/change_log.md
+++ b/change_log.md
@@ -3,6 +3,97 @@ SCP-firmware Change Log
Copyright (c) 2019-2021, Arm Limited and Contributors. All rights reserved.
+SCP-firmware - version 2.9.0
+============================
+
+New features
+------------
+
+- Framework:
+ - Add light events
+ - fwk_log: Add option for minimal banner
+
+- New modules:
+ - Mock Voltage Domain driver
+ - PMI and DWT PMI driver
+ - PCIE integration control register
+ - CMN Skeena
+ - Cadence I2C
+
+- SCMI:
+ - scmi_perf: Add performance plugins handler extension
+
+- Build system:
+ - CMake: Add support for parallel build
+ - CMake: Add support for framework tests
+
+Changed
+-------
+
+- Documentation:
+ - clock: Add documentation for Clock Management Framework
+
+- Arch:
+ - arm: Add interrupt disable/enable inline calls
+
+- Framework:
+ - Remove Signals
+ - Remove module name parameter
+
+- Modules:
+ - clock: Add Clock Management Framework
+ - mod_resource_perms: Fix recursion on mod_res_message_id_to_index
+ - cmn700: Add support to configure additional non-hash mem regions
+ - cmn700: Update root node offset calculation for bigger mesh
+ - cmn700: Add hierarchical hashing support with 3 SN mode
+ - psu: Add error return from mod_psu_process_bind_request
+ - sds: Clear data valid flag after SCP RAM FW has been transferred
+
+- Platforms:
+ - juno/scmi_perf: Simplify configuration of FastChannels
+ - juno/software_mmap: Remove unused SCMI_FAST_CHANNEL_SIZE
+ - juno: Provide PMI and DWT PMI config
+ - n1sdp: Enable non-secure CoreSight access in C2C setup
+ - n1sdp: Add dynamic calculations of PLL parameters
+ - morello: Restructure dmc_bing module
+ - rdv1mc, sgi575: Add config for MCP
+ - Add support for tc1
+ - tc0: Add SCMI FastChannels configuration
+ - tc0: Use separate PLLs for seperate core types
+ - tc0: Add example configuration for Voltage Domain
+ - tc0: Enable DVFS for Matterhorn ELP Arm cores
+ - tc0: Update SCP PIK
+ - rdv1mc: Add support for DVFS and SCMI Perf
+ - rdv1mc: Enable fast channel
+ - rdv1mc: Add mock PSU for dvfs
+ - rdn2: Update register layout for pik's in rdn2 platform
+ - rdn2: Disable NEWLIB_NANO for RD-N2 platform
+ - rdn2: Add support for variant 1 of rdn2 platform
+ - rdn2: Add ecam and mmio memory regions in cmn700 config
+ - rdn2: Update NCI GPV region 0 in cmn700 config
+ - rdn2: Add all NCI GPV regions in cmn700 config
+ - rdn2: Add config data for pcie integ control module
+ - rdn2: Add support for mcp ramfw
+ - rdv1: Add config data for mcp romfw bootloader module
+ - rdv1: Add config data for clock module in MCP RAM firmware
+ - rdv1: Add config data for pl011 UART module in mcp ramfw
+ - rdv1: Add configuration data for MPU module in mcp ramfw
+ - rdv1: Add generic timer config data for mcp ramfw
+ - rdv1: Add timer HAL config data for mcp ramfw
+ - rdv1: Add platform specific definitions for rtx
+ - rdv1: Add mcp_platform module for rdv1
+ - rdv1: Add build support for mcp ram firmware
+ - rdv1: Add debugger CLI module config data for mcp ramfw
+ - synquacer: Add shutdown handler in ppu_v0_synquacer module
+
+- MISRA C:2012:
+ - SCMI, Framework: Fix rule 9.5 violations
+ - mod_resource_perms: Fix rule 16.5 violations
+ - module: Fix rule 10.3 violations
+ - fwk: Fix rules 11.9, 16.3 and 17.7 violations
+ - arch: Fix rule 15.6 violations
+ - arch/armv7-m: Fix rules 10.1 and 17.7 violations
+
SCP-firmware - version 2.8.0
============================
diff --git a/doc/cmake_readme.md b/doc/cmake_readme.md
index 832705648e2ad898919fc0fd387869b154799d2a..03f1f3a241bf8971dcc8c2c582eaa56a4b32735a 100644
--- a/doc/cmake_readme.md
+++ b/doc/cmake_readme.md
@@ -96,10 +96,6 @@ See below to build and execute framework tests
**LIMITATIONS**
-- CMake build of rdn2 platform is not working. It requires further
- investigation.
-- CMake build of platform synquacer is not tested.
-- CMake build of platform rcar is not tested.
- ArmClang toolchain is supported but not all platforms are working.
**NOTE**: Read below documentation for advanced use of development environment
diff --git a/doc/code_rules.md b/doc/code_rules.md
index cfb3a8aa1db62141dd9d160c8c10690c3fd43ef8..66de5258f9311da43a55f7c5c0273107224f318f 100644
--- a/doc/code_rules.md
+++ b/doc/code_rules.md
@@ -72,15 +72,15 @@ cppcheck --xml \
MISRAC-2012
-----------
-The SCP-firmware is gradually achieving compliance with MISRAC-2012. To date,
-the mandatory rules have been resolved.
+The SCP-firmware is attempting to achieve compliance with MISRAC-2012.
+To date, the mandatory rules have been resolved.
In order to provide a reference, Juno platform is taken as a first platform to
-provide compliance. At the same time, a MISRAC-2012 checker will run upon PR
-submission.
+attempt alignment with the guidance. At the same time, a MISRAC-2012 checker
+will run upon PR submission.
Please note that new patches will have to be compliant with the current status
-of compliance.
+of violations.
C Standard Library
------------------
diff --git a/framework/test/CMakeLists.txt b/framework/test/CMakeLists.txt
index b2c3083e982799f227f07ac6825e495e975a37dd..39a798478c782d178f30ae5f4f7cc18458f60974 100644
--- a/framework/test/CMakeLists.txt
+++ b/framework/test/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.18.3)
project(
SCP_FWK_TEST
- VERSION 2.8.0
+ VERSION 2.9.0
DESCRIPTION "Arm SCP/MCP Software Framework tests"
HOMEPAGE_URL
"https://developer.arm.com/tools-and-software/open-source-software/firmware/scp-firmware"
diff --git a/readme.md b/readme.md
index b77b1468030f0cdd775feeb99605a09c99e88bfe..0aaf35cb9b12a1342dc6538963b2940abfcb1b56 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-SCP-firmware - version 2.8
+SCP-firmware - version 2.9
==========================
Copyright (c) 2011-2021, Arm Limited. All rights reserved.
@@ -71,6 +71,7 @@ Virtual Platforms (FVPs or boards where possible):
- Renesas R-Car platform
- Total Compute (tc0) platform (Please contact Arm directly to obtain the TC0 FVP)
- Morello (Please see Arm's Ecosystem FVPs Developer page)
+- Total Compute (tc1) platform (Please contact Arm directly to obtain the TC1 FVP)
License
-------