aboutsummaryrefslogtreecommitdiff
path: root/interface
diff options
context:
space:
mode:
authorKevin Peng <kevin.peng@arm.com>2020-12-31 10:22:59 +0800
committerKen Liu <ken.liu@arm.com>2021-01-26 04:08:54 +0000
commit578a8492155aa44b6b15307f14d903dc0f011cc6 (patch)
tree31e9ebdddb5b178b62282c66aa90f4c66f2126fd /interface
parent55ba01f19b5a2eada89558a22d8b7ad02aaa8017 (diff)
downloadtrusted-firmware-m-578a8492155aa44b6b15307f14d903dc0f011cc6.tar.gz
Tools: Naming refine: manifest -> partition
The "manifest.manifest" in template is confusing. It should be "partition.manifest" instead. This patch does this change to make the templates much more easy to read and understand. Also updates the obsolete example code in the document. Change-Id: Iac0328f353267342187707c405eea57721209443 Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Diffstat (limited to 'interface')
-rw-r--r--interface/include/psa_manifest/pid.h.template12
-rw-r--r--interface/include/psa_manifest/sid.h.template12
-rw-r--r--interface/include/tfm_veneers.h.template16
3 files changed, 20 insertions, 20 deletions
diff --git a/interface/include/psa_manifest/pid.h.template b/interface/include/psa_manifest/pid.h.template
index 667040196..223ab78fe 100644
--- a/interface/include/psa_manifest/pid.h.template
+++ b/interface/include/psa_manifest/pid.h.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -14,15 +14,15 @@
extern "C" {
#endif
-{% for manifest in manifests %}
- {% if manifest.attr.pid - 256 < 0 %}
-#error "Partition ID for '{{manifest.manifest.name}}' have to be at least TFM_SP_BASE"
+{% for partition in partitions %}
+ {% if partition.attr.pid - 256 < 0 %}
+#error "Partition ID for '{{partition.manifest.name}}' have to be at least TFM_SP_BASE"
{% else %}
-#define {{"%-62s"|format(manifest.manifest.name)}} ({{manifest.attr.pid}})
+#define {{"%-62s"|format(partition.manifest.name)}} ({{partition.attr.pid}})
{% endif %}
{% endfor %}
-#define {{"%-62s"|format("TFM_MAX_USER_PARTITIONS")}} ({{manifests | length()}})
+#define {{"%-62s"|format("TFM_MAX_USER_PARTITIONS")}} ({{partitions | length()}})
#ifdef __cplusplus
}
diff --git a/interface/include/psa_manifest/sid.h.template b/interface/include/psa_manifest/sid.h.template
index f25a1ca2f..5bbacd2c7 100644
--- a/interface/include/psa_manifest/sid.h.template
+++ b/interface/include/psa_manifest/sid.h.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -14,11 +14,11 @@
extern "C" {
#endif
-{% for manifest in manifests %}
- {% if manifest.attr.tfm_partition_ipc %}
-/******** {{manifest.manifest.name}} ********/
- {% if manifest.manifest.services %}
- {% for service in manifest.manifest.services %}
+{% for partition in partitions %}
+ {% if partition.attr.tfm_partition_ipc %}
+/******** {{partition.manifest.name}} ********/
+ {% if partition.manifest.services %}
+ {% for service in partition.manifest.services %}
{% set str = service.name + "_SID" %}
#define {{"%-58s"|format(str)}} ({{"%10s"|format(service.sid)}}U)
{% set str = service.name + "_VERSION" %}
diff --git a/interface/include/tfm_veneers.h.template b/interface/include/tfm_veneers.h.template
index 83012f7ae..502dee28a 100644
--- a/interface/include/tfm_veneers.h.template
+++ b/interface/include/tfm_veneers.h.template
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -16,16 +16,16 @@
extern "C" {
#endif
-{% for manifest in manifests %}
- {% if manifest.attr.conditional %}
-#ifdef {{manifest.attr.conditional}}
+{% for partition in partitions %}
+ {% if partition.attr.conditional %}
+#ifdef {{partition.attr.conditional}}
{% endif %}
-/******** {{manifest.manifest.name}} ********/
- {% for function in manifest.manifest.secure_functions%}
+/******** {{partition.manifest.name}} ********/
+ {% for function in partition.manifest.secure_functions%}
psa_status_t tfm_{{function.signal.lower()}}_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
{% endfor %}
- {% if manifest.attr.conditional %}
-#endif /* {{manifest.attr.conditional}} */
+ {% if partition.attr.conditional %}
+#endif /* {{partition.attr.conditional}} */
{% endif %}
{% endfor %}