commit 710acf56a58942018e7517f60e20d54e7b851a99
author Kevin Peng <kevin.peng@arm.com> Tue Nov 16 11:42:41 2021 +0800
committer Kevin Peng <kevin.peng@arm.com> Tue Nov 16 08:28:40 2021 +0100
tree 6a3e500d96e6842620870e47dfd016ed2f0b1ea7
parent dec9271f819f6c50134b8a4c19db22122be633eb

Interface: Improvements on framework_feature

- Restrict variable replacement on "@VAR@" only
- Set PSA_FRAMEWORK_ISOLATION_LEVEL before configure_file
- Add invalid config check on:
    TFM_LIB_MODEL AND PSA_FRAMEWORK_ISOLATION_LEVEL

Change-Id: Ib3a681716dfb148f62ca4ea0c03b2de9a65b7ca5
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

interface/CMakeLists.txt

diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index bc216b8..ec7f2d1 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -10,8 +10,10 @@
 cmake_policy(SET CMP0079 NEW)
 
 # Generate framework feature
+set(PSA_FRAMEWORK_ISOLATION_LEVEL   ${TFM_ISOLATION_LEVEL})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/psa/framework_feature.h.in
-               ${CMAKE_BINARY_DIR}/generated/interface/include/psa/framework_feature.h)
+               ${CMAKE_BINARY_DIR}/generated/interface/include/psa/framework_feature.h
+               @ONLY)
 
 if (TFM_MULTI_CORE_TOPOLOGY)
     include(${CMAKE_SOURCE_DIR}/platform/ext/target/${TFM_PLATFORM}/preload_ns.cmake)