CMake: Clean up TFM_LVL configuration

Details:
 - Configure TFM_LVL only in CommonConfig.cmake

Change-Id: I4374e15556af1d4b277b8e88279e47ecafbcfc66
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
diff --git a/CommonConfig.cmake b/CommonConfig.cmake
index b70ad71..4a198ef 100755
--- a/CommonConfig.cmake
+++ b/CommonConfig.cmake
@@ -104,6 +104,9 @@
 # Option to demonstrate usage of secure-only peripheral
 set (SECURE_UART1 OFF)
 
+# TF-M isolation level: 1..3, default is 1
+set (TFM_LVL 1)
+
 if (REGRESSION)
 	set(SERVICES_TEST_ENABLED ON)
 else()
@@ -121,6 +124,7 @@
 if (CORE_TEST)
 	set(CORE_TEST_POSITIVE ON)
 	set(CORE_TEST_INTERACTIVE OFF)
+	set(TFM_LVL 3)
 endif()
 
 if (CORE_TEST_INTERACTIVE)