Kconfig: Add secure log support

Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: I1d86289a85443ea98c289fcb0671b8792929e3a4
diff --git a/config/kconfig.cmake b/config/kconfig.cmake
index 83f051d..38b28c6 100644
--- a/config/kconfig.cmake
+++ b/config/kconfig.cmake
@@ -290,7 +290,3 @@
 
 # Load defaults, setting options not already set
 include(config/config_base.cmake)
-
-# Set secure log configs
-# It also depends on regression test config.
-include(config/tfm_secure_log.cmake)
diff --git a/secure_fw/partitions/Kconfig b/secure_fw/partitions/Kconfig
index 75afc93..239a652 100644
--- a/secure_fw/partitions/Kconfig
+++ b/secure_fw/partitions/Kconfig
@@ -38,4 +38,9 @@
     default 1 if PARTITION_LOG_LEVEL_ERROR
     default 0 if PARTITION_LOG_LEVEL_SILENCE
 
+config TFM_SP_LOG_RAW_ENABLED
+    bool
+    default y if TFM_PARTITION_LOG_LEVEL != 0 || TFM_S_REG_TEST || TFM_NS_REG_TEST
+    default n
+
 endmenu
diff --git a/secure_fw/spm/Kconfig b/secure_fw/spm/Kconfig
index 6b20dd8..6c8db95 100644
--- a/secure_fw/spm/Kconfig
+++ b/secure_fw/spm/Kconfig
@@ -135,6 +135,11 @@
 
 endmenu
 
+config TFM_SPM_LOG_RAW_ENABLED
+    bool
+    default y if TFM_SPM_LOG_LEVEL != 0 || TFM_SP_LOG_RAW_ENABLED
+    default n
+
 ######################## Promptless (non-user) config options ##################
 ########### Do NOT change the following config options anywhere! ###############
 config CONFIG_TFM_PARTITION_META