commit eab7eaef06ed02d3c4579dfbbedf0a0967e2bf42
author Mingyang Sun <mingyang.sun@arm.com> Thu Sep 30 13:06:52 2021 +0800
committer Ken Liu <ken.liu@arm.com> Tue Oct 19 03:01:40 2021 +0200
tree f75cbd60448d251bb66d60ddd8eb256e4cfc337b
parent 5e68b11764673ee32bae0de8ecf3cde45cc55ea1

Tools: Count partition numbers and output config

For implementation runtime model configurations. If there is no
IPC partition, the runtime model can be set as SFN. And the
runtime model is IPC by default.

Generate file 'config_impl.h' to indicate the current runtime
model. This file can be referenced by components like SPM,
partitions and interfaces.

Change-Id: I584ada22446a0da67d15e95d8a64a8700f82c75a
Signed-off-by: Ken Liu <Ken.Liu@arm.com>

tools/tfm_generated_file_list.yaml

diff --git a/tools/tfm_generated_file_list.yaml b/tools/tfm_generated_file_list.yaml
index 95eae40..0c866c7 100644
--- a/tools/tfm_generated_file_list.yaml
+++ b/tools/tfm_generated_file_list.yaml
@@ -50,6 +50,12 @@
         "short_name": "pid.h",
         "template": "interface/include/psa_manifest/pid.h.template",
         "output": "interface/include/psa_manifest/pid.h"
+    },
+    {
+        "name": "SPM config header",
+        "short_name": "config_impl.h",
+        "template": "interface/include/config_impl.h.template",
+        "output": "interface/include/config_impl.h"
     }
   ]
 }

tools/tfm_parse_manifest_list.py

diff --git a/tools/tfm_parse_manifest_list.py b/tools/tfm_parse_manifest_list.py
index 9b7a36a..82acdb1 100644
--- a/tools/tfm_parse_manifest_list.py
+++ b/tools/tfm_parse_manifest_list.py
@@ -109,6 +109,8 @@
 
     partition_list = []
     manifest_list = []
+    ipc_partition_num = 0
+    sfn_partition_num = 0
 
     for f in manifest_list_files:
         with open(f) as manifest_list_yaml_file:
@@ -168,6 +170,14 @@
         manifest = manifest_validation(yaml.safe_load(file))
         file.close()
 
+        # Count the number of IPC partitions
+        if manifest["psa_framework_version"] == 1.1 and manifest["model"] == 'IPC':
+            ipc_partition_num += 1
+        elif manifest["psa_framework_version"] == 1.1 and manifest["model"] == 'SFN':
+            sfn_partition_num += 1
+        elif "services" in manifest.keys():
+            ipc_partition_num += 1
+
         manifest_dir, manifest_name = os.path.split(manifest_path)
         manifest_out_basename = manifest_name.replace('.yaml', '').replace('.json', '')
 
@@ -217,7 +227,7 @@
 
         raise Exception("Duplicated SID found, check above for details")
 
-    return partition_list
+    return partition_list, ipc_partition_num, sfn_partition_num
 
 def gen_per_partition_files(context):
     """
@@ -481,7 +491,7 @@
     """
     os.chdir(os.path.join(sys.path[0], ".."))
 
-    partition_list = process_partition_manifests(manifest_list, extra_manifests_list)
+    partition_list, ipc_partition_num, sfn_partition_num = process_partition_manifests(manifest_list, extra_manifests_list)
 
     utilities = {}
     utilities['donotedit_warning'] = donotedit_warning
@@ -491,6 +501,9 @@
     context['utilities'] = utilities
     context['stateless_services'] = process_stateless_services(partition_list, 32)
 
+    context['ipc_partition_num'] = ipc_partition_num
+    context['sfn_partition_num'] = sfn_partition_num
+
     gen_per_partition_files(context)
     gen_summary_files(context, gen_file_list)