commit 1ffdcfe09bd99b5c0f11e0a6af1113fd73fda8ff
author David Hu <david.hu@arm.com> Fri Oct 13 14:52:40 2023 +0800
committer David Hu <david.hu@arm.com> Tue Oct 17 15:08:54 2023 +0800
tree 391cdb500c7b9da1f4a31612cf88920aca50e357
parent 1c1b81614896cf0bb82344ce8a1dd45bd4b55f7a

Build: Explicitly include cpuarch.cmake

Include NS cpuarch.cmake exported by TF-M build to set up CPU/Arch fixed
flags, which might affect other later configurations.
Unnecessary for each toolchain to include cpuarch.cmake respectively.

Signed-off-by: David Hu <david.hu@arm.com>
Change-Id: I1a55037a2afeaf51697559a771976a107b528d79

tests_psa_arch/CMakeLists.txt

diff --git a/tests_psa_arch/CMakeLists.txt b/tests_psa_arch/CMakeLists.txt
index a81e57f..ee80fb4 100644
--- a/tests_psa_arch/CMakeLists.txt
+++ b/tests_psa_arch/CMakeLists.txt
@@ -13,6 +13,10 @@
 endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CONFIG_SPE_PATH}/cmake)
+
+# A platform sprecific MCPU and architecture flags for NS side
+include(${CONFIG_SPE_PATH}/platform/cpuarch.cmake)
+
 include(spe_config)
 include(${CONFIG_SPE_PATH}/platform/config.cmake)
 

tests_reg/CMakeLists.txt

diff --git a/tests_reg/CMakeLists.txt b/tests_reg/CMakeLists.txt
index bb0f03e..29c1501 100644
--- a/tests_reg/CMakeLists.txt
+++ b/tests_reg/CMakeLists.txt
@@ -15,6 +15,8 @@
     set(CMAKE_TOOLCHAIN_FILE  ${CONFIG_SPE_PATH}/cmake/toolchain_ns_GNUARM.cmake)
 endif()
 
+# A platform sprecific MCPU and architecture flags for NS side
+include(${CONFIG_SPE_PATH}/platform/cpuarch.cmake)
 # Platform abilities for example IRQ test support status
 include(${CONFIG_SPE_PATH}/platform/config.cmake OPTIONAL)