aboutsummaryrefslogtreecommitdiff
path: root/secure_fw
diff options
context:
space:
mode:
authorKen Liu <Ken.Liu@arm.com>2021-05-22 13:15:08 +0800
committerKen Liu <ken.liu@arm.com>2021-05-25 12:14:04 +0200
commit861b0786da41e8357cfd5e226417d464eb200980 (patch)
treefde6096cf2d494751dfa2a78d4ab32069f218ab8 /secure_fw
parenta7288ea710325988d56fd2ab4bdcbe8e3ae79021 (diff)
downloadtrusted-firmware-m-861b0786da41e8357cfd5e226417d464eb200980.tar.gz
Tools: Change parser processing sequence
The existing sequence outputs partition files directly, which leaves no chance to reflect the post-processed partition data in the result file. A rational sequence should be: - Collect per partition info by parsing their manifests (no writing). - Post operations on collected data (Stateless handle processing e.g.). - Write files based on updated data at the last step. The variable names in parser and templates are updated as well. Change-Id: I553c19960d81d7d8cde524f0e55f1b278c5e3dfe Signed-off-by: Ken Liu <Ken.Liu@arm.com>
Diffstat (limited to 'secure_fw')
-rw-r--r--secure_fw/partitions/manifestfilename.template6
-rw-r--r--secure_fw/partitions/partition_load_info.template2
2 files changed, 4 insertions, 4 deletions
diff --git a/secure_fw/partitions/manifestfilename.template b/secure_fw/partitions/manifestfilename.template
index 5c24e7abfb..d0b2e9a81d 100644
--- a/secure_fw/partitions/manifestfilename.template
+++ b/secure_fw/partitions/manifestfilename.template
@@ -7,8 +7,8 @@
{{utilities.donotedit_warning}}
-#ifndef __PSA_MANIFEST_{{file_name.upper()}}_H__
-#define __PSA_MANIFEST_{{file_name.upper()}}_H__
+#ifndef __PSA_MANIFEST_{{manifest_out_basename.upper()}}_H__
+#define __PSA_MANIFEST_{{manifest_out_basename.upper()}}_H__
#ifdef __cplusplus
extern "C" {
@@ -71,4 +71,4 @@ psa_flih_result_t {{irq.name|lower}}_flih(void);
}
#endif
-#endif /* __PSA_MANIFEST_{{file_name.upper()}}_H__ */
+#endif /* __PSA_MANIFEST_{{manifest_out_basename.upper()}}_H__ */
diff --git a/secure_fw/partitions/partition_load_info.template b/secure_fw/partitions/partition_load_info.template
index 2ce1b677eb..ad005dddae 100644
--- a/secure_fw/partitions/partition_load_info.template
+++ b/secure_fw/partitions/partition_load_info.template
@@ -17,7 +17,7 @@
#include "tfm_peripherals_def.h"
#include "psa_manifest/pid.h"
#include "psa_manifest/sid.h"
-#include "psa_manifest/{{file_name}}.h"
+#include "psa_manifest/{{manifest_out_basename}}.h"
{% set counter = namespace(dep_counter=0, service_counter=0, asset_counter=0) %}
{% if manifest.dependencies %}