commit ae99e2d1448dafc7fa983bc40c1a578fee837d65
author Xinyu Zhang <xinyu.zhang@arm.com> Fri Jul 28 14:03:29 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Thu Aug 03 14:11:34 2023 +0800
tree 0bb4e1799b47a2e793ce8a75e105afad07dd9e69
parent fe62ce454ddc6a8fba46b225bf8ec0b9d7b16166

Build: Unify isolation level setting with TFM_ISOLATION_LEVEL

There is a CMake configuration "TFM_ISOLATION_LEVEL", which can also be
used as the CMake compile definition. To make the code easier to
maintain, remove current compile definition "TFM_LVL" and unify the
isolation level setting with "TFM_ISOLATION_LEVEL".

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I659744b470e8da6f14457094402e45cf77964406

interface/CMakeLists.txt

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 9a0c7e0..f3434e2 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -41,7 +41,7 @@
 target_compile_definitions(psa_interface
     INTERFACE
         $<$<BOOL:${CONFIG_TFM_ENABLE_CTX_MGMT}>:CONFIG_TFM_ENABLE_CTX_MGMT>
-        $<$<BOOL:${TFM_ISOLATION_LEVEL}>:TFM_LVL=${TFM_ISOLATION_LEVEL}>
+        $<$<BOOL:${TFM_ISOLATION_LEVEL}>:TFM_ISOLATION_LEVEL=${TFM_ISOLATION_LEVEL}>
         $<$<BOOL:${CONFIG_TFM_USE_TRUSTZONE}>:CONFIG_TFM_USE_TRUSTZONE>
         $<$<BOOL:${TFM_MULTI_CORE_TOPOLOGY}>:TFM_MULTI_CORE_TOPOLOGY>
         $<$<BOOL:${CONFIG_TFM_PARTITION_META}>:CONFIG_TFM_PARTITION_META>

interface/include/config_impl.h.template

diff --git a/interface/include/config_impl.h.template b/interface/include/config_impl.h.template
index 4a172e3..ade895c 100644
--- a/interface/include/config_impl.h.template
+++ b/interface/include/config_impl.h.template
@@ -27,7 +27,7 @@
 
 #if CONFIG_TFM_SPM_BACKEND_IPC == 1
 /* Trustzone NS agent working stack size. */
-#if defined(TFM_FIH_PROFILE_ON) && TFM_LVL == 1
+#if defined(TFM_FIH_PROFILE_ON) && TFM_ISOLATION_LEVEL == 1
 #define {{"%-56s"|format("CONFIG_TFM_NS_AGENT_TZ_STACK_SIZE")}} 1256
 #else
 #define {{"%-56s"|format("CONFIG_TFM_NS_AGENT_TZ_STACK_SIZE")}} 1024