Set minimum CMake version to 3.21
* Update documentation to list CMake 3.21 as the default version. This
brings the documentation in line with the cmake files, which already
use 3.21 as the minimum version.
* Downgrade the CMake version required by the IAR build from 3.22 to
3.21. This makes the CMake minimum version consistent across the
entire repository. (similar work is required for an example in
tf-m-extras).
Change-Id: I57e42a07ad7894c663670136e580518f7d299dc4
Signed-off-by: Nik Dewally <Nik.Dewally@arm.com>
diff --git a/docs/building/tfm_build_instruction.rst b/docs/building/tfm_build_instruction.rst
index 53c43fd..d8ee5f1 100644
--- a/docs/building/tfm_build_instruction.rst
+++ b/docs/building/tfm_build_instruction.rst
@@ -20,7 +20,7 @@
Refer to :doc:`Building Tests </building/tests_build_instruction>` on how to build TF-M
regression tests and PSA Arch tests to verify TF-M.
-TF-M uses `CMake <https://cmake.org/overview/>`__ **v3.15** or higher.
+TF-M uses `CMake <https://cmake.org/overview/>`__ **v3.21** or higher.
Before starting please make sure you have all required software installed and
configured as explained in the
:doc:`TF-M getting started </getting_started/tfm_getting_started>`.
diff --git a/docs/building/tfm_build_instruction_iar.rst b/docs/building/tfm_build_instruction_iar.rst
index 59564ea..4bf45d5 100644
--- a/docs/building/tfm_build_instruction_iar.rst
+++ b/docs/building/tfm_build_instruction_iar.rst
@@ -14,7 +14,7 @@
Currently the MUSCA_B1 and MUSCA_S1 targets are not supported with IARARM,
due to lack of testing.
- cmake needs to be version 3.14 or newer.
+ cmake needs to be version 3.21 or newer.
The V8M IAR CMSIS_5 RTX libraries in CMSIS_5 5.5.0 has a problem and has been updated in
CMSIS_5 5.7.0. The updated libraries are part of the tf-m-tests repo and no special instructions
diff --git a/docs/getting_started/tfm_getting_started.rst b/docs/getting_started/tfm_getting_started.rst
index 8983625..0d7d53e 100644
--- a/docs/getting_started/tfm_getting_started.rst
+++ b/docs/getting_started/tfm_getting_started.rst
@@ -73,7 +73,7 @@
.. note::
- Please download cmake 3.15 or later version from https://cmake.org/download/.
+ Please download CMake version 3.21 or later from https://cmake.org/download/.
4. add CMake path into environment:
@@ -87,10 +87,10 @@
Windows 10 x64
- 2. install dependecies:
+ 2. install dependencies:
- Git client latest version (https://git-scm.com/download/win)
- - CMake (`native Windows version <https://cmake.org/download/>`__)
+ - CMake version 3.21 or later (`native Windows version <https://cmake.org/download/>`__)
- GNU make (http://gnuwin32.sourceforge.net/packages/make.htm)
- Python3 `(native Windows version) <https://www.python.org/downloads/>`__ and
the pip package manager (from Python 3.4 it's included)
@@ -418,7 +418,7 @@
To build the TF-M firmware the following tools are needed:
- C compiler of supported toolchains
- - CMake version 3.15 or later
+ - CMake version 3.21 or later
- Git
- gmake, aka GNU Make
- Python v3.x
diff --git a/platform/ns/toolchain_ns_IARARM.cmake b/platform/ns/toolchain_ns_IARARM.cmake
index 53ccde3..56566f4 100644
--- a/platform/ns/toolchain_ns_IARARM.cmake
+++ b/platform/ns/toolchain_ns_IARARM.cmake
@@ -5,7 +5,7 @@
#
#-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.21)
cmake_policy(SET CMP0115 NEW)
SET(CMAKE_SYSTEM_NAME Generic)
diff --git a/toolchain_IARARM.cmake b/toolchain_IARARM.cmake
index d8daffd..b6e946d 100644
--- a/toolchain_IARARM.cmake
+++ b/toolchain_IARARM.cmake
@@ -6,7 +6,7 @@
#
#-------------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.21)
cmake_policy(SET CMP0115 NEW)
SET(CMAKE_SYSTEM_NAME Generic)