cpu arch compilation param accounted for A profile
Signed-off-by: jothikumar mani <jothikumar.mani@arm.com>
diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt
index f5e45c1..63f6a41 100644
--- a/api-tests/CMakeLists.txt
+++ b/api-tests/CMakeLists.txt
@@ -125,6 +125,7 @@
armv8m_bl
armv81m_ml
armv7m
+ armv7a
armv8a
)
diff --git a/api-tests/tools/cmake/compiler/ARMCLANG.cmake b/api-tests/tools/cmake/compiler/ARMCLANG.cmake
index 95ee012..4b792b3 100644
--- a/api-tests/tools/cmake/compiler/ARMCLANG.cmake
+++ b/api-tests/tools/cmake/compiler/ARMCLANG.cmake
@@ -16,7 +16,7 @@
#**/
set(CMAKE_SYSTEM_NAME Generic)
-set(CMKE_SYSTEM_PROCESSOR ARM)
+set(CMAKE_SYSTEM_PROCESSOR ARM)
set(_C_TOOLCHAIN_NAME armclang)
@@ -58,6 +58,10 @@
set(TARGET_SWITCH "-march=armv8-m.base -mcmse")
elseif(${CPU_ARCH} STREQUAL armv81m_ml)
set(TARGET_SWITCH "-march=armv8.1-m.main -mcmse")
+elseif(${CPU_ARCH} STREQUAL armv7a)
+ set(TARGET_SWITCH "-march=armv7-a")
+elseif(${CPU_ARCH} STREQUAL armv8a)
+ set(TARGET_SWITCH "-march=armv8-a")
endif()
set(CMAKE_C_FLAGS "--target=arm-arm-none-eabi ${TARGET_SWITCH} -g -Wall -Werror -Wextra -fshort-enums -fshort-wchar -funsigned-char -fdata-sections -ffunction-sections -mno-unaligned-access -mfpu=none")
diff --git a/api-tests/tools/cmake/compiler/GCC_LINUX.cmake b/api-tests/tools/cmake/compiler/GCC_LINUX.cmake
index fea82d1..e0c31af 100755
--- a/api-tests/tools/cmake/compiler/GCC_LINUX.cmake
+++ b/api-tests/tools/cmake/compiler/GCC_LINUX.cmake
@@ -1,5 +1,5 @@
#/** @file
-# * Copyright (c) 2021, Arm Limited or its affiliates. All rights reserved.
+# * Copyright (c) 2021-2023, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
# * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,9 @@
set(CMAKE_SYSTEM_NAME Generic)
if(CPU_ARCH STREQUAL "armv8a")
- set(CMKE_SYSTEM_PROCESSOR ARM)
+ set(CMAKE_SYSTEM_PROCESSOR ARM)
else()
- set(CMKE_SYSTEM_PROCESSOR x86_64)
+ set(CMAKE_SYSTEM_PROCESSOR x86_64)
endif()
if(DEFINED COMPILER_NAME)
diff --git a/api-tests/tools/cmake/compiler/GNUARM.cmake b/api-tests/tools/cmake/compiler/GNUARM.cmake
index bf073a6..6815e75 100644
--- a/api-tests/tools/cmake/compiler/GNUARM.cmake
+++ b/api-tests/tools/cmake/compiler/GNUARM.cmake
@@ -16,7 +16,7 @@
#**/
set(CMAKE_SYSTEM_NAME Generic)
-set(CMKE_SYSTEM_PROCESSOR ARM)
+set(CMAKE_SYSTEM_PROCESSOR ARM)
set(_C_TOOLCHAIN_NAME arm-none-eabi-gcc)
@@ -58,6 +58,10 @@
set(TARGET_SWITCH "-march=armv8-m.base -mcmse")
elseif(${CPU_ARCH} STREQUAL armv81m_ml)
set(TARGET_SWITCH "-march=armv8.1-m.main -mcmse")
+elseif(${CPU_ARCH} STREQUAL armv7a)
+ set(TARGET_SWITCH "-march=armv7-a")
+elseif(${CPU_ARCH} STREQUAL armv8a)
+ set(TARGET_SWITCH "-march=armv8-a")
endif()
set(CMAKE_C_FLAGS "${TARGET_SWITCH} -g -Wall -Werror -Wextra -fdata-sections -ffunction-sections -mno-unaligned-access")
diff --git a/api-tests/tools/cmake/compiler/HOST_GCC.cmake b/api-tests/tools/cmake/compiler/HOST_GCC.cmake
index d990ff8..54d5bfb 100644
--- a/api-tests/tools/cmake/compiler/HOST_GCC.cmake
+++ b/api-tests/tools/cmake/compiler/HOST_GCC.cmake
@@ -1,5 +1,5 @@
#/** @file
-# * Copyright (c) 2019-2022, Arm Limited or its affiliates. All rights reserved.
+# * Copyright (c) 2019-2023, Arm Limited or its affiliates. All rights reserved.
# * SPDX-License-Identifier : Apache-2.0
# *
# * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
#**/
set(CMAKE_SYSTEM_NAME Generic)
-set(CMKE_SYSTEM_PROCESSOR x86_64)
+set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(_C_TOOLCHAIN_NAME gcc)
diff --git a/api-tests/val/val_nspe.cmake b/api-tests/val/val_nspe.cmake
index ae0af8d..961782d 100644
--- a/api-tests/val/val_nspe.cmake
+++ b/api-tests/val/val_nspe.cmake
@@ -17,6 +17,7 @@
# Listing all the sources from val
list(APPEND VAL_SRC_C_NSPE
+ ${PSA_ROOT_DIR}/val/nspe/val_platform.c
${PSA_ROOT_DIR}/val/nspe/val_entry.c
${PSA_ROOT_DIR}/val/nspe/val_dispatcher.c
${PSA_ROOT_DIR}/val/nspe/val_framework.c