commit f993cd4d736e8ff472ef25df229cb81e2a33480a
author Summer Qin <summer.qin@arm.com> Wed Aug 12 16:55:17 2020 +0800
committer Ken Liu <ken.liu@arm.com> Tue Aug 25 07:33:16 2020 +0000
tree 0eebafd15e58b84853339300951bb4eb381a25f1
parent 894438607db860bbb09811ce88a6cc4bbac90ab6

SPM: Sort out main.c including and dependency check

This patch contains:
 - Including are now sorted by alphabet.
 - Sort out the compile-time dependency checking.

Change-Id: I84e981daf38f4ebb47205bc1a076f954d9dad897
Signed-off-by: Summer Qin <summer.qin@arm.com>

secure_fw/spm/cmsis_psa/main.c

diff --git a/secure_fw/spm/cmsis_psa/main.c b/secure_fw/spm/cmsis_psa/main.c
index a5d72e1..5e160d6 100644
--- a/secure_fw/spm/cmsis_psa/main.c
+++ b/secure_fw/spm/cmsis_psa/main.c
@@ -5,14 +5,14 @@
  *
  */
 
+#include "log/tfm_log.h"
 #include "region.h"
+#include "spm_ipc.h"
 #include "tfm_internal.h"
 #include "tfm_irq_list.h"
 #include "tfm_nspm.h"
 #include "tfm_spm_hal.h"
 #include "tfm_version.h"
-#include "log/tfm_log.h"
-#include "spm_ipc.h"
 
 /*
  * Avoids the semihosting issue
@@ -24,9 +24,7 @@
 
 #ifndef TFM_LVL
 #error TFM_LVL is not defined!
-#endif
-
-#if (TFM_LVL != 1) && (TFM_LVL != 2)
+#elif (TFM_LVL != 1) && (TFM_LVL != 2)
 #error Only TFM_LVL 1 and 2 are supported for IPC model!
 #endif