TFM: Add defines to mbed_lib.json

components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/mbed_lib.json

@@ -1,21 +1,4 @@
 {
-    "name": "tfm",
-    "config": {
-        "handle_pool_size": {
-            "help": "maximum number of handles that can be opened at the same time",
-            "macro_name": "TFM_CONN_HANDLE_MAX_NUM",
-            "value": 10
-        },
-        "rot_pool_size": {
-            "help": "maximum number of RoT services allowed",
-            "macro_name": "TFM_SPM_MAX_ROT_SERV_NUM",
-            "value": 20
-        },
-        "message_pool_size": {
-            "help": "maximum number of RoT services allowed",
-            "macro_name": "TFM_MSG_QUEUE_MAX_MSG_NUM",
-            "value": 10
-        }
-    }
+    "name": "tfm-s",
+    "macros": ["MBED_FAULT_HANDLER_DISABLED", "BYPASS_NVSTORE_CHECK=1"]
 }
-

components/TARGET_PSA/TARGET_TFM/mbed_lib.json

@@ -0,0 +1,29 @@
+{
+    "name": "tfm",
+    "macros": [
+        "TFM_PSA_API", "MBED_TZ_DEFAULT_ACCESS=1"
+    ],
+    "config": {
+        "level": {
+            "help": "TFM security level",
+            "macro_name": "TFM_LVL",
+            "value": 1
+        },
+        "handle_pool_size": {
+            "help": "maximum number of handles that can be opened at the same time",
+            "macro_name": "TFM_CONN_HANDLE_MAX_NUM",
+            "value": 10
+        },
+        "rot_pool_size": {
+            "help": "maximum number of RoT services allowed",
+            "macro_name": "TFM_SPM_MAX_ROT_SERV_NUM",
+            "value": 20
+        },
+        "message_pool_size": {
+            "help": "maximum number of RoT services allowed",
+            "macro_name": "TFM_MSG_QUEUE_MAX_MSG_NUM",
+            "value": 10
+        }
+    }
+}
+

components/TARGET_PSA/TARGET_TFM/tf-m-integration.md

@@ -64,9 +64,7 @@ The target should be represented in a following way in `target.json` (`MUSCA_A1`
         "core": "Cortex-M33-NS",
         "device_has_add": ["INTERRUPTIN", "LPTICKER", "SERIAL", "SLEEP", "USTICKER"],
         "macros": [
-            "MBED_TZ_DEFAULT_ACCESS=1",
             "MBED_FAULT_HANDLER_DISABLED",
-            "TFM_PSA_API",
             "MBEDTLS_PSA_CRYPTO_C"
         ],
         "extra_labels_add": ["MUSCA_A1_NS", "PSA", "TFM"],
@@ -77,16 +75,10 @@ The target should be represented in a following way in `target.json` (`MUSCA_A1`
         "core": "Cortex-M33",
         "device_has_add": ["FLASH"],
         "macros": [
-            "MBED_FAULT_HANDLER_DISABLED",
             "MBED_MPU_CUSTOM",
-            "BYPASS_NVSTORE_CHECK",
-            "TFM_LVL=1",
-            "TFM_PSA_API",
             "MBEDTLS_PSA_CRYPTO_SPM",
             "MBEDTLS_PSA_CRYPTO_C",
-            "MBEDTLS_ENTROPY_NV_SEED",
-            "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
-            "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
+            "MBEDTLS_ENTROPY_NV_SEED"
         ],
         "components_add": ["FLASHIAP"],
         "extra_labels_add": ["MUSCA_A1_S", "PSA", "TFM"]
@@ -116,4 +108,4 @@ Mbed-OS contains customized TF-M version. TF-M services reference implementation
 
 The porting layer consists of:
 - All functions listed in: `components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/platform/include/tfm_spm_hal.h`
-- Flash API `mbed-os/hal/flash_api.h` implementation is required for TZ image. It is used by PSA Internal trusted storage implementation.
+- Flash API `mbed-os/hal/flash_api.h` implementation is required for TZ image. It is used by PSA Internal trusted storage implementation.

tools/psa/tfm/mbed_app.json

@@ -1,5 +1,5 @@
 {
     "name": "tfm_build",
-    "requires" : ["psa-services", "tfm"],
+    "requires" : ["psa-services", "tfm", "tfm-s"],
     "artifact_name": "tfm"
 }