Build: Rename config_default to config_base
Signed-off-by: Anton Komlev <anton.komlev@arm.com>
Change-Id: I04e223699fcfe7ed35af95369d0c7140df69edf1
diff --git a/config/config_default.cmake b/config/config_base.cmake
similarity index 100%
rename from config/config_default.cmake
rename to config/config_base.cmake
diff --git a/config/set_config.cmake b/config/set_config.cmake
index e563ed8..b6f4fa8 100644
--- a/config/set_config.cmake
+++ b/config/set_config.cmake
@@ -77,7 +77,7 @@
include(config/cp_config_default.cmake)
# Load defaults, setting options not already set
-include(config/config_default.cmake)
+include(config/config_base.cmake)
# Load TF-M model specific default config
if (CONFIG_TFM_SPM_BACKEND STREQUAL "SFN")
diff --git a/docs/building/tfm_build_instruction.rst b/docs/building/tfm_build_instruction.rst
index ca8fa05..cf24848 100644
--- a/docs/building/tfm_build_instruction.rst
+++ b/docs/building/tfm_build_instruction.rst
@@ -49,7 +49,7 @@
===================
All configuration options are provided by cmake variables, and their default
-values, with docstrings, can be found in ``config/config_default.cmake``.
+values, with docstrings, can be found in ``config/config_base.cmake``.
Configuration is provided in multiple stages. Each stage will not override any
config that has already been set at any of the prior stages.
@@ -67,7 +67,7 @@
accelerator type is applied if it exists.
7. If it exists, TFM Profile specific config is applied from
``config/profile/<tfm_profile>.cmake``.
- 8. ``config/config_default.cmake`` is loaded.
+ 8. ``config/config_base.cmake`` is loaded.
9. If ``TEST_S`` or ``TEST_NS`` or other single test suite config like
``TEST_NS_ATTESTATION`` (see `Regression test configuration`_)is set, then
config from ``${TFM_TEST_REPO_PATH}/test/config/set_config.cmake`` and
@@ -119,7 +119,7 @@
Other cmake parameters
----------------------
-The full list of default options is in ``config/config_default.cmake``. Several
+The full list of default options is in ``config/config_base.cmake``. Several
important options are listed below.
@@ -402,7 +402,7 @@
| psa-arch-tests | PSA_ARCH_TESTS_PATH | https://github.com/ARM-software/psa-arch-tests |
+----------------+---------------------+-----------------------------------------------------+
-For required versions of the dependencies, refer to ``config/config_default.cmake``.
+For required versions of the dependencies, refer to ``config/config_base.cmake``.
.. Note::
- Some patches are required to the mbedtls repo to allow building it as part of
@@ -420,7 +420,7 @@
Dependency auto downloading is used by default.
The TF-M build system downloads the tf-m-tests repo with a fixed version
specified by ``TFM_TEST_REPO_VERSION`` in
-:file:`lib/ext/tf-m-tests/repo_config_default.cmake`.
+:file:`lib/ext/tf-m-tests/repo_config_base.cmake`.
The version can be a release tag or a commit hash.
Developers who want a different version of tf-m-tests can override
@@ -451,7 +451,7 @@
cd <Mbed Crypto base folder>
git clone https://github.com/ARMmbed/mbedtls
cd mbedtls
- git checkout <MBEDCRYPTO_VERSION from config_default.cmake>
+ git checkout <MBEDCRYPTO_VERSION from config_base.cmake>
git apply <TF-M base folder>/trusted-firmware-m/lib/ext/mbedcrypo/*.patch
.. Note::
diff --git a/docs/integration_guide/platform/platform_ext_folder.rst b/docs/integration_guide/platform/platform_ext_folder.rst
index c586ec8..949f2c6 100644
--- a/docs/integration_guide/platform/platform_ext_folder.rst
+++ b/docs/integration_guide/platform/platform_ext_folder.rst
@@ -141,8 +141,8 @@
This file collects platform-specific overrides to the configuration options.
This should only contain cmake options that are included in
-``config_default.cmake``. These options should be set as ``CACHE`` variables, as
-they are in ``config_default.cmake``.
+``config_base.cmake``. These options should be set as ``CACHE`` variables, as
+they are in ``config_base.cmake``.
CMakeLists.txt
^^^^^^^^^^^^^^
diff --git a/docs/integration_guide/services/tfm_its_integration_guide.rst b/docs/integration_guide/services/tfm_its_integration_guide.rst
index ced65e2..b8a1bd8 100644
--- a/docs/integration_guide/services/tfm_its_integration_guide.rst
+++ b/docs/integration_guide/services/tfm_its_integration_guide.rst
@@ -262,7 +262,7 @@
The ITS service uses a set of C definitions to compile in/out certain features,
as well as to configure certain service parameters. When using the TF-M build
system, these definitions are controlled by build flags of the same name. The
-``config/config_default.cmake`` file sets the default values of those flags, but
+``config/config_base.cmake`` file sets the default values of those flags, but
they can be overwritten based on platform capabilities by setting them in
``platform/ext/target/<TARGET_NAME>/config.cmake``. The list of ITS service
build definitions is:
diff --git a/docs/integration_guide/services/tfm_ps_integration_guide.rst b/docs/integration_guide/services/tfm_ps_integration_guide.rst
index b44d503..0a9d721 100644
--- a/docs/integration_guide/services/tfm_ps_integration_guide.rst
+++ b/docs/integration_guide/services/tfm_ps_integration_guide.rst
@@ -319,7 +319,7 @@
The PS service uses a set of C definitions to compile in/out certain features,
as well as to configure certain service parameters. When using the TF-M build
system, these definitions are controlled by build flags of the same name. The
-``config/config_default.cmake`` file sets the default values of those flags, but
+``config/config_base.cmake`` file sets the default values of those flags, but
they can be overwritten based on platform capabilities by setting them in
``platform/ext/target/<TARGET_NAME>/config.cmake``. The list of PS service build
definitions is:
diff --git a/docs/integration_guide/services/tfm_secure_partition_addition.rst b/docs/integration_guide/services/tfm_secure_partition_addition.rst
index b4e1d95..04e5f51 100644
--- a/docs/integration_guide/services/tfm_secure_partition_addition.rst
+++ b/docs/integration_guide/services/tfm_secure_partition_addition.rst
@@ -245,7 +245,7 @@
Partition.
The value of this attribute must be a decimal or hexadecimal value in bytes.
It can also be a build configurable with default value defined in
-``config_default.cmake``.
+``config_base.cmake``.
The value of the configuration can be overridden to fit different use cases.
heap_size
@@ -309,7 +309,7 @@
- ``tfm_app_rot_partition*`` in case of an Application RoT partition
The current CMake configuration should also be updated, by updating
-``<TF-M base folder>/config/config_default.cmake``
+``<TF-M base folder>/config/config_base.cmake``
to include the CMake configuration variable of the newly added Secure
Partition, e.g, TFM_PARTITION_EXAMPLE and adding the relevant
subdirectory in ``<TF-M base folder>/secure_fw/CMakeLists.txt``, e.g.
diff --git a/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst b/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst
index 62c66f1..735c625 100644
--- a/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst
+++ b/docs/technical_references/design_docs/profiles/tfm_profile_medium.rst
@@ -252,7 +252,7 @@
.. Note::
Where a configuration is the same as the default in
- ``config/config_default.cmake``, it is omitted from the profile configuration
+ ``config/config_base.cmake``, it is omitted from the profile configuration
file.
Test configuration