aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdison Ai <edison.ai@arm.com>2019-06-17 16:34:48 +0800
committerEdison Ai <edison.ai@arm.com>2019-06-28 08:53:57 +0800
commit18142c645b05388786ace20ca56228fe2e8ad111 (patch)
treed363e32c1f0ce2931c6d17edc03ec9c0ee182c7e
parent8ebf36523305a7e47d106b73adf31ec656a6047b (diff)
downloadtrusted-firmware-m-18142c645b05388786ace20ca56228fe2e8ad111.tar.gz
Build: Correct name of linker_pattern region
According to PSA FF, rename "tfm_linker_pattern" to "linker_pattern". Change-Id: I50bb57d149c3a4b99dc8bdc6556c3f04c51f4020 Signed-off-by: Edison Ai <edison.ai@arm.com>
-rw-r--r--platform/ext/common/armclang/tfm_common_s.sct.template32
-rw-r--r--platform/ext/common/gcc/tfm_common_s.ld.template48
-rw-r--r--secure_fw/services/audit_logging/manifest.yaml2
-rw-r--r--secure_fw/services/crypto/manifest.yaml2
-rw-r--r--secure_fw/services/initial_attestation/manifest.yaml2
-rw-r--r--secure_fw/services/platform/manifest.yaml2
-rw-r--r--secure_fw/services/secure_storage/manifest.yaml2
-rw-r--r--test/test_services/tfm_core_test/manifest.yaml2
-rw-r--r--test/test_services/tfm_core_test_2/manifest.yaml2
-rw-r--r--test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml2
-rw-r--r--test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml2
-rw-r--r--test/test_services/tfm_secure_client_service/manifest.yaml2
12 files changed, 50 insertions, 50 deletions
diff --git a/platform/ext/common/armclang/tfm_common_s.sct.template b/platform/ext/common/armclang/tfm_common_s.sct.template
index 351d4ae749..f94a3d7247 100644
--- a/platform/ext/common/armclang/tfm_common_s.sct.template
+++ b/platform/ext/common/armclang/tfm_common_s.sct.template
@@ -55,13 +55,13 @@ LR_CODE S_CODE_START {
#ifdef {{manifest.attr.conditional}}
{% endif %}
{{manifest.manifest.name}} +0 ALIGN 32 {
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RO)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}} (+RO)
{% endfor %}
{% endif %}
@@ -94,13 +94,13 @@ LR_CODE S_CODE_START {
#ifdef {{manifest.attr.conditional}}
{% endif %}
{{manifest.manifest.name}} +0 ALIGN 32 {
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RO)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}} (+RO)
{% endfor %}
{% endif %}
@@ -172,13 +172,13 @@ LR_CODE S_CODE_START {
#ifdef {{manifest.attr.conditional}}
{% endif %}
{{manifest.manifest.name}}_DATA +0 ALIGN 32 {
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RW +ZI)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}} (+RW +ZI)
{% endfor %}
{% endif %}
@@ -225,13 +225,13 @@ LR_CODE S_CODE_START {
#ifdef {{manifest.attr.conditional}}
{% endif %}
{{manifest.manifest.name}}_DATA +0 ALIGN 32 {
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RW +ZI)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}} (+RW +ZI)
{% endfor %}
{% endif %}
diff --git a/platform/ext/common/gcc/tfm_common_s.ld.template b/platform/ext/common/gcc/tfm_common_s.ld.template
index 878ce06da9..4382478037 100644
--- a/platform/ext/common/gcc/tfm_common_s.ld.template
+++ b/platform/ext/common/gcc/tfm_common_s.ld.template
@@ -156,14 +156,14 @@ SECTIONS
{% endif %}
.{{manifest.manifest.name}} : ALIGN(32)
{
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.text*)
{{pattern}}:*(.rodata*)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}}(.text*)
{{pattern}}(.rodata*)
{% endfor %}
@@ -194,14 +194,14 @@ SECTIONS
{% endif %}
.{{manifest.manifest.name}} : ALIGN(32)
{
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.text*)
{{pattern}}:*(.rodata*)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}}(.text*)
{{pattern}}(.rodata*)
{% endfor %}
@@ -363,13 +363,13 @@ SECTIONS
{% endif %}
.{{manifest.manifest.name}}_DATA : ALIGN(32)
{
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.data*)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}}(.data*)
{% endfor %}
{% endif %}
@@ -381,14 +381,14 @@ SECTIONS
.{{manifest.manifest.name}}_BSS : ALIGN(32)
{
start_of_{{manifest.manifest.name}} = .;
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.bss*)
{{pattern}}:*(COMMON)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}}(.bss*)
{{pattern}}(COMMON)
{% endfor %}
@@ -441,13 +441,13 @@ SECTIONS
{% endif %}
.{{manifest.manifest.name}}_DATA : ALIGN(32)
{
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.data*)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}}(.data*)
{% endfor %}
{% endif %}
@@ -459,14 +459,14 @@ SECTIONS
.{{manifest.manifest.name}}_BSS : ALIGN(32)
{
start_of_{{manifest.manifest.name}} = .;
- {% if manifest.manifest.tfm_linker_pattern.library_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.library_list %}
+ {% if manifest.manifest.linker_pattern.library_list %}
+ {% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.bss*)
{{pattern}}:*(COMMON)
{% endfor %}
{% endif %}
- {% if manifest.manifest.tfm_linker_pattern.object_list %}
- {% for pattern in manifest.manifest.tfm_linker_pattern.object_list %}
+ {% if manifest.manifest.linker_pattern.object_list %}
+ {% for pattern in manifest.manifest.linker_pattern.object_list %}
{{pattern}}(.bss*)
{{pattern}}(COMMON)
{% endfor %}
diff --git a/secure_fw/services/audit_logging/manifest.yaml b/secure_fw/services/audit_logging/manifest.yaml
index bf4cc3f8cb..07fb879346 100644
--- a/secure_fw/services/audit_logging/manifest.yaml
+++ b/secure_fw/services/audit_logging/manifest.yaml
@@ -62,7 +62,7 @@
"minor_policy": "strict"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"library_list": [
"*tfm_audit*"
]
diff --git a/secure_fw/services/crypto/manifest.yaml b/secure_fw/services/crypto/manifest.yaml
index b1ede42080..ca1709f0c8 100644
--- a/secure_fw/services/crypto/manifest.yaml
+++ b/secure_fw/services/crypto/manifest.yaml
@@ -369,7 +369,7 @@
"minor_policy": "STRICT"
},
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"library_list": [
"*tfm_crypto*"
]
diff --git a/secure_fw/services/initial_attestation/manifest.yaml b/secure_fw/services/initial_attestation/manifest.yaml
index eb9c1c8382..a33b5a63d4 100644
--- a/secure_fw/services/initial_attestation/manifest.yaml
+++ b/secure_fw/services/initial_attestation/manifest.yaml
@@ -31,7 +31,7 @@
"minor_policy": "strict"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"library_list": [
"*tfm_attest*"
]
diff --git a/secure_fw/services/platform/manifest.yaml b/secure_fw/services/platform/manifest.yaml
index 01014bc6b6..81af25ecad 100644
--- a/secure_fw/services/platform/manifest.yaml
+++ b/secure_fw/services/platform/manifest.yaml
@@ -31,7 +31,7 @@
"minor_policy": "strict"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"library_list": [
"*tfm_platform*"
]
diff --git a/secure_fw/services/secure_storage/manifest.yaml b/secure_fw/services/secure_storage/manifest.yaml
index 7e684e698e..48ba07a65b 100644
--- a/secure_fw/services/secure_storage/manifest.yaml
+++ b/secure_fw/services/secure_storage/manifest.yaml
@@ -96,7 +96,7 @@
"minor_policy": "STRICT"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"library_list": [
"*tfm_storage*"
]
diff --git a/test/test_services/tfm_core_test/manifest.yaml b/test/test_services/tfm_core_test/manifest.yaml
index b1bbd8d65d..67c2d07e5a 100644
--- a/test/test_services/tfm_core_test/manifest.yaml
+++ b/test/test_services/tfm_core_test/manifest.yaml
@@ -45,7 +45,7 @@
"minor_policy": "strict"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"object_list": [
"*tfm_ss_core_test.*"
]
diff --git a/test/test_services/tfm_core_test_2/manifest.yaml b/test/test_services/tfm_core_test_2/manifest.yaml
index 6023c35ec9..2e49755226 100644
--- a/test/test_services/tfm_core_test_2/manifest.yaml
+++ b/test/test_services/tfm_core_test_2/manifest.yaml
@@ -47,7 +47,7 @@
"minor_policy": "strict"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"object_list": [
"*tfm_ss_core_test_2.*"
]
diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
index d0f80c8667..f7c7e022af 100644
--- a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
+++ b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
@@ -57,7 +57,7 @@
"minor_policy": "STRICT"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"object_list": [
"*ipc_client_test.*"
]
diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
index 6ed3dc8c5f..97a3d28720 100644
--- a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
+++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
@@ -49,7 +49,7 @@
"minor_policy": "STRICT"
}
],
- "tfm_linker_pattern": {
+ "linker_pattern": {
"object_list": [
"*ipc_service_test.*"
]
diff --git a/test/test_services/tfm_secure_client_service/manifest.yaml b/test/test_services/tfm_secure_client_service/manifest.yaml
index 87c989271d..e90ffc22d4 100644
--- a/test/test_services/tfm_secure_client_service/manifest.yaml
+++ b/test/test_services/tfm_secure_client_service/manifest.yaml
@@ -42,7 +42,7 @@
# Currently there is no platform dependent section of the manifest file,
# therefore all platform dependent files must be listed here which can be used
# on any supported platform.
- "tfm_linker_pattern": {
+ "linker_pattern": {
"object_list": [
"*tfm_secure_client_service.*",
"*test_framework*",