commit 1d6d46943d75d3fe789fdc2c4863c477f265c40a
author Gowtham Siddarth <gowtham.siddarth@arm.com> Mon Sep 16 11:47:29 2019 +0530
committer Gowtham Siddarth <gowtham.siddarth@arm.com> Fri Sep 20 14:42:30 2019 +0530
tree d840ec8484aacd9a5d0282a431b933df3ae19975
parent 6457be5e633b4f7b1b1ae7b4585892d079def56c

Updating default args and docs

- Updated the document with latest supported toolchain information
- Defaulted CPU_ARCH to armv8m_ml if not passed from CMake arguments.

Signed-off-by: Gowtham Siddarth <gowtham.siddarth@arm.com>

api-tests/CMakeLists.txt

diff --git a/api-tests/CMakeLists.txt b/api-tests/CMakeLists.txt
index fa949a3..d1bc028 100644
--- a/api-tests/CMakeLists.txt
+++ b/api-tests/CMakeLists.txt
@@ -96,8 +96,6 @@
 _check_arguments("SUITE")
 # Check for PSA_INCLUDE_PATHS command line argument
 _check_arguments("PSA_INCLUDE_PATHS")
-# Check for CPU_ARCH command line argument
-_check_arguments("CPU_ARCH")
 
 string(TOLOWER ${SUITE} SUITE_LOWER)
 
@@ -191,12 +189,17 @@
         message(STATUS "[PSA] : Defaulting compiler to ${TOOLCHAIN}")
 endif()
 
-# Check for CPU architecture
-if(NOT ${CPU_ARCH} IN_LIST PSA_CPU_ARCH_SUPPORT)
-	message(FATAL_ERROR "[PSA] : Error: Unsupported value for -DCPU_ARCH=, supported CPU arch are : ${PSA_CPU_ARCH_SUPPORT}")
+if(${TOOLCHAIN} STREQUAL "ARMCLANG" OR ${TOOLCHAIN} STREQUAL "GNUARM")
+    if(NOT DEFINED CPU_ARCH)
+	    message(FATAL_ERROR "[PSA] : Error: -DCPU_ARCH option missing")
+    else()
+        # Check for CPU architecture
+        if(NOT ${CPU_ARCH} IN_LIST PSA_CPU_ARCH_SUPPORT)
+	        message(FATAL_ERROR "[PSA] : Error: Unsupported value for -DCPU_ARCH=, supported CPU arch are : ${PSA_CPU_ARCH_SUPPORT}")
+        endif()
+    endif()
 endif()
 
-
 # Check for VERBOSE
 if(NOT DEFINED VERBOSE)
 	set(VERBOSE 3 CACHE INTERNAL "Default VERBOSE value" FORCE)