Platform: an521, musca_b1: Add ISOLATION_LEVEL 3 support with IAR build
Signed-off-by: TTornblom <thomas.tornblom@iar.com>
Change-Id: I4e0f46f797d53206fee22c0f1b0e19e45d94997f
diff --git a/platform/ext/target/arm/mps2/an521/CMakeLists.txt b/platform/ext/target/arm/mps2/an521/CMakeLists.txt
index 70bde5f..d6b26a5 100644
--- a/platform/ext/target/arm/mps2/an521/CMakeLists.txt
+++ b/platform/ext/target/arm/mps2/an521/CMakeLists.txt
@@ -33,6 +33,7 @@
$<$<AND:$<VERSION_LESS:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:IAR>>:${CMAKE_SOURCE_DIR}/platform/ext/common/iar/tfm_common_s.icf>
$<$<AND:$<VERSION_EQUAL:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:ARMClang>>:${CMAKE_BINARY_DIR}/generated/platform/ext/common/armclang/tfm_isolation_l3.sct>
$<$<AND:$<VERSION_EQUAL:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:GNU>>:${CMAKE_BINARY_DIR}/generated/platform/ext/common/gcc/tfm_isolation_l3.ld>
+ $<$<AND:$<VERSION_EQUAL:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:IAR>>:${CMAKE_BINARY_DIR}/generated/platform/ext/common/iar/tfm_isolation_l3.icf>
)
if(NS)
diff --git a/platform/ext/target/arm/mps2/an521/generated_file_list.yaml b/platform/ext/target/arm/mps2/an521/generated_file_list.yaml
index fc36ea2..821671d 100644
--- a/platform/ext/target/arm/mps2/an521/generated_file_list.yaml
+++ b/platform/ext/target/arm/mps2/an521/generated_file_list.yaml
@@ -26,6 +26,12 @@
"short_name": "isolation_l3_ld",
"template": "platform/ext/common/gcc/tfm_isolation_l3.ld.template",
"output": "platform/ext/common/gcc/tfm_isolation_l3.ld"
+ },
+ {
+ "name": "isolation l3 linker script",
+ "short_name": "isolation_l3_icf",
+ "template": "platform/ext/common/iar/tfm_isolation_l3.icf.template",
+ "output": "platform/ext/common/iar/tfm_isolation_l3.icf"
}
]
}
diff --git a/platform/ext/target/arm/musca_b1/generated_file_list.yaml b/platform/ext/target/arm/musca_b1/generated_file_list.yaml
index ff01824..c9a4ec0 100644
--- a/platform/ext/target/arm/musca_b1/generated_file_list.yaml
+++ b/platform/ext/target/arm/musca_b1/generated_file_list.yaml
@@ -26,6 +26,12 @@
"short_name": "isolation_l3_ld",
"template": "platform/ext/common/gcc/tfm_isolation_l3.ld.template",
"output": "platform/ext/common/gcc/tfm_isolation_l3.ld"
+ },
+ {
+ "name": "isolation l3 linker script",
+ "short_name": "isolation_l3_icf",
+ "template": "platform/ext/common/iar/tfm_isolation_l3.icf.template",
+ "output": "platform/ext/common/iar/tfm_isolation_l3.icf"
}
]
}
diff --git a/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt b/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt
index 82c9666..fcfe993 100644
--- a/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt
+++ b/platform/ext/target/arm/musca_b1/sse_200/CMakeLists.txt
@@ -39,6 +39,7 @@
$<$<AND:$<VERSION_LESS:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:IAR>>:${CMAKE_SOURCE_DIR}/platform/ext/common/iar/tfm_common_s.icf>
$<$<AND:$<VERSION_EQUAL:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:ARMClang>>:${CMAKE_BINARY_DIR}/generated/platform/ext/common/armclang/tfm_isolation_l3.sct>
$<$<AND:$<VERSION_EQUAL:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:GNU>>:${CMAKE_BINARY_DIR}/generated/platform/ext/common/gcc/tfm_isolation_l3.ld>
+ $<$<AND:$<VERSION_EQUAL:${TFM_ISOLATION_LEVEL},3>,$<C_COMPILER_ID:IAR>>:${CMAKE_BINARY_DIR}/generated/platform/ext/common/iar/tfm_isolation_l3.icf>
)
if(NS)
diff --git a/toolchain_IARARM.cmake b/toolchain_IARARM.cmake
index de1c369..af65fc7 100644
--- a/toolchain_IARARM.cmake
+++ b/toolchain_IARARM.cmake
@@ -7,6 +7,7 @@
#-------------------------------------------------------------------------------
cmake_minimum_required(VERSION 3.22)
+cmake_policy(SET CMP0115 NEW)
# Don't load this file if it is specified as a cmake toolchain file
if(NOT TFM_TOOLCHAIN_FILE)