Core: Move spm header files to 'spm' folder

- Move 'spm_xxx.h' to 'spm' folder, they should belong to 'spm'.
- Fix and simplify inclusion of header file.
- Fix format and typo error.

Change-Id: I129c6626ddffbbdba0e7edc27e9307f0d6ea9b79
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
diff --git a/secure_fw/spm/init/tfm_boot_data.c b/secure_fw/spm/init/tfm_boot_data.c
index d8e021c..ee4466e 100644
--- a/secure_fw/spm/init/tfm_boot_data.c
+++ b/secure_fw/spm/init/tfm_boot_data.c
@@ -12,8 +12,8 @@
 #include "tfm_internal.h"
 #include "tfm_api.h"
 #include "tfm_core_utils.h"
-#include "tfm/spm_api.h"
-#include "tfm/spm_partition_defs.h"
+#include "spm_api.h"
+#include "spm_partition_defs.h"
 #ifdef TFM_PSA_API
 #include "tfm_internal_defines.h"
 #include "tfm_utils.h"
@@ -22,7 +22,7 @@
 #include "tfm_wait.h"
 #include "tfm_message_queue.h"
 #include "tfm_spm_hal.h"
-#include "tfm/spm_db.h"
+#include "spm_db.h"
 #endif
 
 /*!