Remove demand for MBED_SPM on single v7 platforms

Author: Oren Cohen

components/TARGET_PSA/inc/psa/client.h

@@ -15,11 +15,9 @@
  * limitations under the License.
  */
 
-#if defined(TARGET_MBED_SPM)
-#include "psa_defs.h"
-#include "spm_client.h"
-#endif
-
 #if defined(TARGET_TFM)
 #include "interface/include/psa_client.h"
+#else
+#include "psa_defs.h"
+#include "spm_client.h"
 #endif

components/TARGET_PSA/inc/psa/service.h

@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 
-#if defined(TARGET_MBED_SPM)
+#if defined(TARGET_TFM)
+#include "interface/include/psa_service.h"
+#else
 #include "psa_defs.h"
 #include "spm_server.h"
 #include "spm_panic.h"
 #endif
-
-#if defined(TARGET_TFM)
-#include "interface/include/psa_service.h"
-#endif

targets/targets.json

@@ -1452,8 +1452,7 @@
             "KPSDK_CODE",
             "MCU_K64F",
             "Freescale_EMAC",
-            "PSA",
-            "MBED_SPM"
+            "PSA"
         ],
         "is_disk_virtual": true,
         "macros": ["CPU_MK64FN1M0VMD12", "FSL_RTOS_MBED", "MBEDTLS_PSA_CRYPTO_C"],
@@ -2003,7 +2002,7 @@
         "extra_labels_add": ["LPCXpresso"],
         "detect_code": ["1056"],
         "release_versions": ["2", "5"],
-        "components_add": ["QSPIF"]        
+        "components_add": ["QSPIF"]
     },
     "FF_LPC546XX": {
         "inherits": ["MCU_LPC546XX"],