aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdison Ai <edison.ai@arm.com>2019-10-11 18:24:47 +0800
committerKen Liu <ken.liu@arm.com>2019-11-20 06:29:51 +0000
commitb2134e6f2086353f7a4eaa59f2c7126309de21ea (patch)
tree60273a96ae9430680579aa20f9c326d242f8e196
parent387663fc7b7b6416a7472e6667ab9f3330c102eb (diff)
downloadtrusted-firmware-m-b2134e6f2086353f7a4eaa59f2c7126309de21ea.tar.gz
Build: Use generated PID
Use the partition ID generated by tools: - Remove tfm_partition_defs.inc. - Change the partition name with "_LINKER" postfix in linker files and related files. Because the partition name is used as macro for partition ID. - Remove "id" attribute from manifest file. Change-Id: I3e60954e6d15f62fea0f1345862d2865743f8c53 Signed-off-by: Edison Ai <edison.ai@arm.com>
-rw-r--r--platform/ext/common/armclang/tfm_common_s.sct72
-rw-r--r--platform/ext/common/armclang/tfm_common_s.sct.template16
-rw-r--r--platform/ext/common/gcc/tfm_common_s.ld562
-rw-r--r--platform/ext/common/gcc/tfm_common_s.ld.template84
-rw-r--r--secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc4
-rw-r--r--secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc.template4
-rw-r--r--secure_fw/core/tfm_boot_data.c2
-rw-r--r--secure_fw/core/tfm_secure_irq_handlers.inc6
-rw-r--r--secure_fw/core/tfm_secure_irq_handlers.inc.template6
-rw-r--r--secure_fw/ns_callable/tfm_veneers.c2
-rw-r--r--secure_fw/ns_callable/tfm_veneers.c.template2
-rw-r--r--secure_fw/services/audit_logging/tfm_audit_logging.yaml1
-rw-r--r--secure_fw/services/crypto/tfm_crypto.yaml1
-rw-r--r--secure_fw/services/initial_attestation/tfm_initial_attestation.yaml1
-rw-r--r--secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml1
-rw-r--r--secure_fw/services/platform/tfm_platform.yaml1
-rw-r--r--secure_fw/services/secure_storage/tfm_secure_storage.yaml1
-rw-r--r--secure_fw/services/tfm_partition_defs.inc55
-rw-r--r--secure_fw/services/tfm_partition_defs.inc.template28
-rw-r--r--secure_fw/services/tfm_service_list.inc84
-rw-r--r--secure_fw/services/tfm_service_list.inc.template2
-rw-r--r--secure_fw/services/tfm_spm_db.inc506
-rw-r--r--secure_fw/services/tfm_spm_db.inc.template42
-rw-r--r--secure_fw/spm/spm_partition_defs.h4
-rw-r--r--test/test_services/tfm_core_test/tfm_test_core.yaml1
-rw-r--r--test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c6
-rw-r--r--test/test_services/tfm_core_test_2/tfm_test_core_2.yaml1
-rw-r--r--test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml1
-rw-r--r--test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml1
-rw-r--r--test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml1
-rw-r--r--test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml1
-rw-r--r--tools/tfm_generated_file_list.yaml5
32 files changed, 702 insertions, 802 deletions
diff --git a/platform/ext/common/armclang/tfm_common_s.sct b/platform/ext/common/armclang/tfm_common_s.sct
index 97d4d41bcf..832d83a489 100644
--- a/platform/ext/common/armclang/tfm_common_s.sct
+++ b/platform/ext/common/armclang/tfm_common_s.sct
@@ -49,49 +49,49 @@ LR_CODE S_CODE_START {
TFM_PSA_CODE_START +0 ALIGN 32 EMPTY 0x0 {
}
- TFM_SP_STORAGE +0 ALIGN 32 {
+ TFM_SP_STORAGE_LINKER +0 ALIGN 32 {
*tfm_storage* (+RO)
*(TFM_SP_STORAGE_ATTR_FN)
}
- TFM_SP_ITS +0 ALIGN 32 {
+ TFM_SP_ITS_LINKER +0 ALIGN 32 {
*tfm_internal_trusted_storage* (+RO)
*(TFM_SP_ITS_ATTR_FN)
}
#ifdef TFM_PARTITION_AUDIT_LOG
- TFM_SP_AUDIT_LOG +0 ALIGN 32 {
+ TFM_SP_AUDIT_LOG_LINKER +0 ALIGN 32 {
*tfm_audit* (+RO)
*(TFM_SP_AUDIT_LOG_ATTR_FN)
}
#endif /* TFM_PARTITION_AUDIT_LOG */
- TFM_SP_CRYPTO +0 ALIGN 32 {
+ TFM_SP_CRYPTO_LINKER +0 ALIGN 32 {
*tfm_crypto* (+RO)
*(TFM_SP_CRYPTO_ATTR_FN)
}
#ifdef TFM_PARTITION_PLATFORM
- TFM_SP_PLATFORM +0 ALIGN 32 {
+ TFM_SP_PLATFORM_LINKER +0 ALIGN 32 {
*tfm_platform* (+RO)
*(TFM_SP_PLATFORM_ATTR_FN)
}
#endif /* TFM_PARTITION_PLATFORM */
- TFM_SP_INITIAL_ATTESTATION +0 ALIGN 32 {
+ TFM_SP_INITIAL_ATTESTATION_LINKER +0 ALIGN 32 {
*tfm_attest* (+RO)
*(TFM_SP_INITIAL_ATTESTATION_ATTR_FN)
}
#ifdef TFM_PARTITION_TEST_CORE
- TFM_SP_CORE_TEST +0 ALIGN 32 {
+ TFM_SP_CORE_TEST_LINKER +0 ALIGN 32 {
*tfm_ss_core_test.* (+RO)
*(TFM_SP_CORE_TEST_ATTR_FN)
}
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- TFM_SP_SECURE_TEST_PARTITION +0 ALIGN 32 {
+ TFM_SP_SECURE_TEST_PARTITION_LINKER +0 ALIGN 32 {
*tfm_secure_client_service.* (+RO)
*test_framework* (+RO)
*uart_stdout.* (+RO)
@@ -106,7 +106,7 @@ LR_CODE S_CODE_START {
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- TFM_SP_IPC_SERVICE_TEST +0 ALIGN 32 {
+ TFM_SP_IPC_SERVICE_TEST_LINKER +0 ALIGN 32 {
*ipc_service_test.* (+RO)
*(TFM_SP_IPC_SERVICE_TEST_ATTR_FN)
}
@@ -128,21 +128,21 @@ LR_CODE S_CODE_START {
}
#ifdef TFM_PARTITION_TEST_CORE
- TFM_SP_CORE_TEST_2 +0 ALIGN 32 {
+ TFM_SP_CORE_TEST_2_LINKER +0 ALIGN 32 {
*tfm_ss_core_test_2.* (+RO)
*(TFM_SP_CORE_TEST_2_ATTR_FN)
}
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- TFM_SP_IPC_CLIENT_TEST +0 ALIGN 32 {
+ TFM_SP_IPC_CLIENT_TEST_LINKER +0 ALIGN 32 {
*ipc_client_test.* (+RO)
*(TFM_SP_IPC_CLIENT_TEST_ATTR_FN)
}
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
- TFM_IRQ_TEST_1 +0 ALIGN 32 {
+ TFM_IRQ_TEST_1_LINKER +0 ALIGN 32 {
*tfm_irq_test_service_1.* (+RO)
*timer_cmsdk* (+RO)
*(TFM_IRQ_TEST_1_ATTR_FN)
@@ -209,33 +209,33 @@ LR_CODE S_CODE_START {
}
#ifdef TFM_PARTITION_TEST_CORE
- TFM_SP_CORE_TEST_2_DATA +0 ALIGN 32 {
+ TFM_SP_CORE_TEST_2_LINKER_DATA +0 ALIGN 32 {
*tfm_ss_core_test_2.* (+RW +ZI)
*(TFM_SP_CORE_TEST_2_ATTR_RW)
*(TFM_SP_CORE_TEST_2_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_CORE_TEST_2_STACK +0 ALIGN 128 EMPTY 0x0200 {
+ TFM_SP_CORE_TEST_2_LINKER_STACK +0 ALIGN 128 EMPTY 0x0200 {
}
#endif
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- TFM_SP_IPC_CLIENT_TEST_DATA +0 ALIGN 32 {
+ TFM_SP_IPC_CLIENT_TEST_LINKER_DATA +0 ALIGN 32 {
*ipc_client_test.* (+RW +ZI)
*(TFM_SP_IPC_CLIENT_TEST_ATTR_RW)
*(TFM_SP_IPC_CLIENT_TEST_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_IPC_CLIENT_TEST_STACK +0 ALIGN 128 EMPTY 0x0220 {
+ TFM_SP_IPC_CLIENT_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x0220 {
}
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
- TFM_IRQ_TEST_1_DATA +0 ALIGN 32 {
+ TFM_IRQ_TEST_1_LINKER_DATA +0 ALIGN 32 {
*tfm_irq_test_service_1.* (+RW +ZI)
*timer_cmsdk* (+RW +ZI)
*(TFM_IRQ_TEST_1_ATTR_RW)
@@ -243,7 +243,7 @@ LR_CODE S_CODE_START {
}
#if defined (TFM_PSA_API)
- TFM_IRQ_TEST_1_STACK +0 ALIGN 128 EMPTY 0x0400 {
+ TFM_IRQ_TEST_1_LINKER_STACK +0 ALIGN 128 EMPTY 0x0400 {
}
#endif
#endif /* TFM_ENABLE_IRQ_TEST */
@@ -294,91 +294,91 @@ LR_CODE S_CODE_START {
TFM_PSA_RW_STACK_START +0 ALIGN 32 EMPTY 0x0 {
}
- TFM_SP_STORAGE_DATA +0 ALIGN 32 {
+ TFM_SP_STORAGE_LINKER_DATA +0 ALIGN 32 {
*tfm_storage* (+RW +ZI)
*(TFM_SP_STORAGE_ATTR_RW)
*(TFM_SP_STORAGE_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_STORAGE_STACK +0 ALIGN 128 EMPTY 0xA00 {
+ TFM_SP_STORAGE_LINKER_STACK +0 ALIGN 128 EMPTY 0xA00 {
}
#endif
- TFM_SP_ITS_DATA +0 ALIGN 32 {
+ TFM_SP_ITS_LINKER_DATA +0 ALIGN 32 {
*tfm_internal_trusted_storage* (+RW +ZI)
*(TFM_SP_ITS_ATTR_RW)
*(TFM_SP_ITS_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_ITS_STACK +0 ALIGN 128 EMPTY 0x500 {
+ TFM_SP_ITS_LINKER_STACK +0 ALIGN 128 EMPTY 0x500 {
}
#endif
#ifdef TFM_PARTITION_AUDIT_LOG
- TFM_SP_AUDIT_LOG_DATA +0 ALIGN 32 {
+ TFM_SP_AUDIT_LOG_LINKER_DATA +0 ALIGN 32 {
*tfm_audit* (+RW +ZI)
*(TFM_SP_AUDIT_LOG_ATTR_RW)
*(TFM_SP_AUDIT_LOG_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_AUDIT_LOG_STACK +0 ALIGN 128 EMPTY 0 {
+ TFM_SP_AUDIT_LOG_LINKER_STACK +0 ALIGN 128 EMPTY 0 {
}
#endif
#endif /* TFM_PARTITION_AUDIT_LOG */
- TFM_SP_CRYPTO_DATA +0 ALIGN 32 {
+ TFM_SP_CRYPTO_LINKER_DATA +0 ALIGN 32 {
*tfm_crypto* (+RW +ZI)
*(TFM_SP_CRYPTO_ATTR_RW)
*(TFM_SP_CRYPTO_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_CRYPTO_STACK +0 ALIGN 128 EMPTY 0x2000 {
+ TFM_SP_CRYPTO_LINKER_STACK +0 ALIGN 128 EMPTY 0x2000 {
}
#endif
#ifdef TFM_PARTITION_PLATFORM
- TFM_SP_PLATFORM_DATA +0 ALIGN 32 {
+ TFM_SP_PLATFORM_LINKER_DATA +0 ALIGN 32 {
*tfm_platform* (+RW +ZI)
*(TFM_SP_PLATFORM_ATTR_RW)
*(TFM_SP_PLATFORM_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_PLATFORM_STACK +0 ALIGN 128 EMPTY 0 {
+ TFM_SP_PLATFORM_LINKER_STACK +0 ALIGN 128 EMPTY 0 {
}
#endif
#endif /* TFM_PARTITION_PLATFORM */
- TFM_SP_INITIAL_ATTESTATION_DATA +0 ALIGN 32 {
+ TFM_SP_INITIAL_ATTESTATION_LINKER_DATA +0 ALIGN 32 {
*tfm_attest* (+RW +ZI)
*(TFM_SP_INITIAL_ATTESTATION_ATTR_RW)
*(TFM_SP_INITIAL_ATTESTATION_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_INITIAL_ATTESTATION_STACK +0 ALIGN 128 EMPTY 0x0A00 {
+ TFM_SP_INITIAL_ATTESTATION_LINKER_STACK +0 ALIGN 128 EMPTY 0x0A00 {
}
#endif
#ifdef TFM_PARTITION_TEST_CORE
- TFM_SP_CORE_TEST_DATA +0 ALIGN 32 {
+ TFM_SP_CORE_TEST_LINKER_DATA +0 ALIGN 32 {
*tfm_ss_core_test.* (+RW +ZI)
*(TFM_SP_CORE_TEST_ATTR_RW)
*(TFM_SP_CORE_TEST_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_CORE_TEST_STACK +0 ALIGN 128 EMPTY 0x0300 {
+ TFM_SP_CORE_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x0300 {
}
#endif
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- TFM_SP_SECURE_TEST_PARTITION_DATA +0 ALIGN 32 {
+ TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA +0 ALIGN 32 {
*tfm_secure_client_service.* (+RW +ZI)
*test_framework* (+RW +ZI)
*uart_stdout.* (+RW +ZI)
@@ -393,20 +393,20 @@ LR_CODE S_CODE_START {
}
#if defined (TFM_PSA_API)
- TFM_SP_SECURE_TEST_PARTITION_STACK +0 ALIGN 128 EMPTY 0x0C00 {
+ TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK +0 ALIGN 128 EMPTY 0x0C00 {
}
#endif
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- TFM_SP_IPC_SERVICE_TEST_DATA +0 ALIGN 32 {
+ TFM_SP_IPC_SERVICE_TEST_LINKER_DATA +0 ALIGN 32 {
*ipc_service_test.* (+RW +ZI)
*(TFM_SP_IPC_SERVICE_TEST_ATTR_RW)
*(TFM_SP_IPC_SERVICE_TEST_ATTR_ZI)
}
#if defined (TFM_PSA_API)
- TFM_SP_IPC_SERVICE_TEST_STACK +0 ALIGN 128 EMPTY 0x0220 {
+ TFM_SP_IPC_SERVICE_TEST_LINKER_STACK +0 ALIGN 128 EMPTY 0x0220 {
}
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
diff --git a/platform/ext/common/armclang/tfm_common_s.sct.template b/platform/ext/common/armclang/tfm_common_s.sct.template
index e1b9b5a8ed..9179276063 100644
--- a/platform/ext/common/armclang/tfm_common_s.sct.template
+++ b/platform/ext/common/armclang/tfm_common_s.sct.template
@@ -54,7 +54,7 @@ LR_CODE S_CODE_START {
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- {{manifest.manifest.name}} +0 ALIGN 32 {
+ {{manifest.manifest.name}}_LINKER +0 ALIGN 32 {
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RO)
@@ -93,7 +93,7 @@ LR_CODE S_CODE_START {
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- {{manifest.manifest.name}} +0 ALIGN 32 {
+ {{manifest.manifest.name}}_LINKER +0 ALIGN 32 {
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RO)
@@ -176,7 +176,7 @@ LR_CODE S_CODE_START {
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- {{manifest.manifest.name}}_DATA +0 ALIGN 32 {
+ {{manifest.manifest.name}}_LINKER_DATA +0 ALIGN 32 {
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RW +ZI)
@@ -193,12 +193,12 @@ LR_CODE S_CODE_START {
{% if manifest.attr.tfm_partition_ipc %}
#if defined (TFM_PSA_API)
- {{manifest.manifest.name}}_STACK +0 ALIGN 128 EMPTY {{manifest.manifest.stack_size}} {
+ {{manifest.manifest.name}}_LINKER_STACK +0 ALIGN 128 EMPTY {{manifest.manifest.stack_size}} {
}
#endif
{% else %}
#if defined (TFM_PSA_API)
- {{manifest.manifest.name}}_STACK +0 ALIGN 128 EMPTY 0 {
+ {{manifest.manifest.name}}_LINKER_STACK +0 ALIGN 128 EMPTY 0 {
}
#endif
{% endif %}
@@ -259,7 +259,7 @@ LR_CODE S_CODE_START {
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- {{manifest.manifest.name}}_DATA +0 ALIGN 32 {
+ {{manifest.manifest.name}}_LINKER_DATA +0 ALIGN 32 {
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}} (+RW +ZI)
@@ -276,12 +276,12 @@ LR_CODE S_CODE_START {
{% if manifest.attr.tfm_partition_ipc %}
#if defined (TFM_PSA_API)
- {{manifest.manifest.name}}_STACK +0 ALIGN 128 EMPTY {{manifest.manifest.stack_size}} {
+ {{manifest.manifest.name}}_LINKER_STACK +0 ALIGN 128 EMPTY {{manifest.manifest.stack_size}} {
}
#endif
{% else %}
#if defined (TFM_PSA_API)
- {{manifest.manifest.name}}_STACK +0 ALIGN 128 EMPTY 0 {
+ {{manifest.manifest.name}}_LINKER_STACK +0 ALIGN 128 EMPTY 0 {
}
#endif
{% endif %}
diff --git a/platform/ext/common/gcc/tfm_common_s.ld b/platform/ext/common/gcc/tfm_common_s.ld
index 3e246c00b5..81091a1a07 100644
--- a/platform/ext/common/gcc/tfm_common_s.ld
+++ b/platform/ext/common/gcc/tfm_common_s.ld
@@ -64,57 +64,57 @@ SECTIONS
LONG (ADDR(.TFM_UNPRIV_DATA))
LONG (SIZEOF(.TFM_UNPRIV_DATA))
#endif /* TFM_LVL != 1 */
- LONG (LOADADDR(.TFM_SP_STORAGE_DATA))
- LONG (ADDR(.TFM_SP_STORAGE_DATA))
- LONG (SIZEOF(.TFM_SP_STORAGE_DATA))
- LONG (LOADADDR(.TFM_SP_ITS_DATA))
- LONG (ADDR(.TFM_SP_ITS_DATA))
- LONG (SIZEOF(.TFM_SP_ITS_DATA))
+ LONG (LOADADDR(.TFM_SP_STORAGE_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_STORAGE_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_DATA))
+ LONG (LOADADDR(.TFM_SP_ITS_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_ITS_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_ITS_LINKER_DATA))
#ifdef TFM_PARTITION_AUDIT_LOG
- LONG (LOADADDR(.TFM_SP_AUDIT_LOG_DATA))
- LONG (ADDR(.TFM_SP_AUDIT_LOG_DATA))
- LONG (SIZEOF(.TFM_SP_AUDIT_LOG_DATA))
+ LONG (LOADADDR(.TFM_SP_AUDIT_LOG_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_AUDIT_LOG_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_AUDIT_LOG_LINKER_DATA))
#endif /* TFM_PARTITION_AUDIT_LOG */
- LONG (LOADADDR(.TFM_SP_CRYPTO_DATA))
- LONG (ADDR(.TFM_SP_CRYPTO_DATA))
- LONG (SIZEOF(.TFM_SP_CRYPTO_DATA))
+ LONG (LOADADDR(.TFM_SP_CRYPTO_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_CRYPTO_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_CRYPTO_LINKER_DATA))
#ifdef TFM_PARTITION_PLATFORM
- LONG (LOADADDR(.TFM_SP_PLATFORM_DATA))
- LONG (ADDR(.TFM_SP_PLATFORM_DATA))
- LONG (SIZEOF(.TFM_SP_PLATFORM_DATA))
+ LONG (LOADADDR(.TFM_SP_PLATFORM_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_PLATFORM_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_PLATFORM_LINKER_DATA))
#endif /* TFM_PARTITION_PLATFORM */
- LONG (LOADADDR(.TFM_SP_INITIAL_ATTESTATION_DATA))
- LONG (ADDR(.TFM_SP_INITIAL_ATTESTATION_DATA))
- LONG (SIZEOF(.TFM_SP_INITIAL_ATTESTATION_DATA))
+ LONG (LOADADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER_DATA))
#ifdef TFM_PARTITION_TEST_CORE
- LONG (LOADADDR(.TFM_SP_CORE_TEST_DATA))
- LONG (ADDR(.TFM_SP_CORE_TEST_DATA))
- LONG (SIZEOF(.TFM_SP_CORE_TEST_DATA))
+ LONG (LOADADDR(.TFM_SP_CORE_TEST_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_CORE_TEST_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_CORE_TEST_LINKER_DATA))
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE
- LONG (LOADADDR(.TFM_SP_CORE_TEST_2_DATA))
- LONG (ADDR(.TFM_SP_CORE_TEST_2_DATA))
- LONG (SIZEOF(.TFM_SP_CORE_TEST_2_DATA))
+ LONG (LOADADDR(.TFM_SP_CORE_TEST_2_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_CORE_TEST_2_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_CORE_TEST_2_LINKER_DATA))
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- LONG (LOADADDR(.TFM_SP_SECURE_TEST_PARTITION_DATA))
- LONG (ADDR(.TFM_SP_SECURE_TEST_PARTITION_DATA))
- LONG (SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_DATA))
+ LONG (LOADADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA))
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- LONG (LOADADDR(.TFM_SP_IPC_SERVICE_TEST_DATA))
- LONG (ADDR(.TFM_SP_IPC_SERVICE_TEST_DATA))
- LONG (SIZEOF(.TFM_SP_IPC_SERVICE_TEST_DATA))
+ LONG (LOADADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER_DATA))
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- LONG (LOADADDR(.TFM_SP_IPC_CLIENT_TEST_DATA))
- LONG (ADDR(.TFM_SP_IPC_CLIENT_TEST_DATA))
- LONG (SIZEOF(.TFM_SP_IPC_CLIENT_TEST_DATA))
+ LONG (LOADADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_DATA))
+ LONG (ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_DATA))
+ LONG (SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER_DATA))
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
- LONG (LOADADDR(.TFM_IRQ_TEST_1_DATA))
- LONG (ADDR(.TFM_IRQ_TEST_1_DATA))
- LONG (SIZEOF(.TFM_IRQ_TEST_1_DATA))
+ LONG (LOADADDR(.TFM_IRQ_TEST_1_LINKER_DATA))
+ LONG (ADDR(.TFM_IRQ_TEST_1_LINKER_DATA))
+ LONG (SIZEOF(.TFM_IRQ_TEST_1_LINKER_DATA))
#endif /* TFM_ENABLE_IRQ_TEST */
#if defined (S_RAM_CODE_START)
LONG (LOADADDR(.TFM_RAM_CODE))
@@ -133,92 +133,92 @@ SECTIONS
LONG (ADDR(.TFM_SECURE_STACK))
LONG (SIZEOF(.TFM_SECURE_STACK))
#endif /* !defined(TFM_PSA_API) */
- LONG (ADDR(.TFM_SP_STORAGE_BSS))
- LONG (SIZEOF(.TFM_SP_STORAGE_BSS))
+ LONG (ADDR(.TFM_SP_STORAGE_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_STORAGE_STACK))
- LONG (SIZEOF(.TFM_SP_STORAGE_STACK))
+ LONG (ADDR(.TFM_SP_STORAGE_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_STORAGE_LINKER_STACK))
#endif
- LONG (ADDR(.TFM_SP_ITS_BSS))
- LONG (SIZEOF(.TFM_SP_ITS_BSS))
+ LONG (ADDR(.TFM_SP_ITS_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_ITS_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_ITS_STACK))
- LONG (SIZEOF(.TFM_SP_ITS_STACK))
+ LONG (ADDR(.TFM_SP_ITS_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_ITS_LINKER_STACK))
#endif
#ifdef TFM_PARTITION_AUDIT_LOG
- LONG (ADDR(.TFM_SP_AUDIT_LOG_BSS))
- LONG (SIZEOF(.TFM_SP_AUDIT_LOG_BSS))
+ LONG (ADDR(.TFM_SP_AUDIT_LOG_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_AUDIT_LOG_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_AUDIT_LOG_STACK))
- LONG (SIZEOF(.TFM_SP_AUDIT_LOG_STACK))
+ LONG (ADDR(.TFM_SP_AUDIT_LOG_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_AUDIT_LOG_LINKER_STACK))
#endif
#endif /* TFM_PARTITION_AUDIT_LOG */
- LONG (ADDR(.TFM_SP_CRYPTO_BSS))
- LONG (SIZEOF(.TFM_SP_CRYPTO_BSS))
+ LONG (ADDR(.TFM_SP_CRYPTO_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_CRYPTO_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_CRYPTO_STACK))
- LONG (SIZEOF(.TFM_SP_CRYPTO_STACK))
+ LONG (ADDR(.TFM_SP_CRYPTO_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_CRYPTO_LINKER_STACK))
#endif
#ifdef TFM_PARTITION_PLATFORM
- LONG (ADDR(.TFM_SP_PLATFORM_BSS))
- LONG (SIZEOF(.TFM_SP_PLATFORM_BSS))
+ LONG (ADDR(.TFM_SP_PLATFORM_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_PLATFORM_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_PLATFORM_STACK))
- LONG (SIZEOF(.TFM_SP_PLATFORM_STACK))
+ LONG (ADDR(.TFM_SP_PLATFORM_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_PLATFORM_LINKER_STACK))
#endif
#endif /* TFM_PARTITION_PLATFORM */
- LONG (ADDR(.TFM_SP_INITIAL_ATTESTATION_BSS))
- LONG (SIZEOF(.TFM_SP_INITIAL_ATTESTATION_BSS))
+ LONG (ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_INITIAL_ATTESTATION_STACK))
- LONG (SIZEOF(.TFM_SP_INITIAL_ATTESTATION_STACK))
+ LONG (ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER_STACK))
#endif
#ifdef TFM_PARTITION_TEST_CORE
- LONG (ADDR(.TFM_SP_CORE_TEST_BSS))
- LONG (SIZEOF(.TFM_SP_CORE_TEST_BSS))
+ LONG (ADDR(.TFM_SP_CORE_TEST_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_CORE_TEST_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_CORE_TEST_STACK))
- LONG (SIZEOF(.TFM_SP_CORE_TEST_STACK))
+ LONG (ADDR(.TFM_SP_CORE_TEST_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_CORE_TEST_LINKER_STACK))
#endif
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE
- LONG (ADDR(.TFM_SP_CORE_TEST_2_BSS))
- LONG (SIZEOF(.TFM_SP_CORE_TEST_2_BSS))
+ LONG (ADDR(.TFM_SP_CORE_TEST_2_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_CORE_TEST_2_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_CORE_TEST_2_STACK))
- LONG (SIZEOF(.TFM_SP_CORE_TEST_2_STACK))
+ LONG (ADDR(.TFM_SP_CORE_TEST_2_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_CORE_TEST_2_LINKER_STACK))
#endif
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- LONG (ADDR(.TFM_SP_SECURE_TEST_PARTITION_BSS))
- LONG (SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_BSS))
+ LONG (ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK))
- LONG (SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_STACK))
+ LONG (ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK))
#endif
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- LONG (ADDR(.TFM_SP_IPC_SERVICE_TEST_BSS))
- LONG (SIZEOF(.TFM_SP_IPC_SERVICE_TEST_BSS))
+ LONG (ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_IPC_SERVICE_TEST_STACK))
- LONG (SIZEOF(.TFM_SP_IPC_SERVICE_TEST_STACK))
+ LONG (ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER_STACK))
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- LONG (ADDR(.TFM_SP_IPC_CLIENT_TEST_BSS))
- LONG (SIZEOF(.TFM_SP_IPC_CLIENT_TEST_BSS))
+ LONG (ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_BSS))
+ LONG (SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_SP_IPC_CLIENT_TEST_STACK))
- LONG (SIZEOF(.TFM_SP_IPC_CLIENT_TEST_STACK))
+ LONG (ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK))
+ LONG (SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK))
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
- LONG (ADDR(.TFM_IRQ_TEST_1_BSS))
- LONG (SIZEOF(.TFM_IRQ_TEST_1_BSS))
+ LONG (ADDR(.TFM_IRQ_TEST_1_LINKER_BSS))
+ LONG (SIZEOF(.TFM_IRQ_TEST_1_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.TFM_IRQ_TEST_1_STACK))
- LONG (SIZEOF(.TFM_IRQ_TEST_1_STACK))
+ LONG (ADDR(.TFM_IRQ_TEST_1_LINKER_STACK))
+ LONG (SIZEOF(.TFM_IRQ_TEST_1_LINKER_STACK))
#endif
#endif /* TFM_ENABLE_IRQ_TEST */
__zero_table_end__ = .;
@@ -253,98 +253,98 @@ SECTIONS
/**** PSA RoT RO part (CODE + RODATA) start here */
Image$$TFM_PSA_CODE_START$$Base = .;
- .TFM_SP_STORAGE : ALIGN(32)
+ .TFM_SP_STORAGE_LINKER : ALIGN(32)
{
*tfm_storage*:*(.text*)
*tfm_storage*:*(.rodata*)
- *(TFM_SP_STORAGE_ATTR_FN)
+ *(TFM_SP_STORAGE_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_STORAGE$$RO$$Base = ADDR(.TFM_SP_STORAGE);
- Image$$TFM_SP_STORAGE$$RO$$Limit = ADDR(.TFM_SP_STORAGE) + SIZEOF(.TFM_SP_STORAGE);
- Image$$TFM_SP_STORAGE$$Base = ADDR(.TFM_SP_STORAGE);
- Image$$TFM_SP_STORAGE$$Limit = ADDR(.TFM_SP_STORAGE) + SIZEOF(.TFM_SP_STORAGE);
+ Image$$TFM_SP_STORAGE_LINKER$$RO$$Base = ADDR(.TFM_SP_STORAGE_LINKER);
+ Image$$TFM_SP_STORAGE_LINKER$$RO$$Limit = ADDR(.TFM_SP_STORAGE_LINKER) + SIZEOF(.TFM_SP_STORAGE_LINKER);
+ Image$$TFM_SP_STORAGE_LINKER$$Base = ADDR(.TFM_SP_STORAGE_LINKER);
+ Image$$TFM_SP_STORAGE_LINKER$$Limit = ADDR(.TFM_SP_STORAGE_LINKER) + SIZEOF(.TFM_SP_STORAGE_LINKER);
- .TFM_SP_ITS : ALIGN(32)
+ .TFM_SP_ITS_LINKER : ALIGN(32)
{
*tfm_internal_trusted_storage*:*(.text*)
*tfm_internal_trusted_storage*:*(.rodata*)
- *(TFM_SP_ITS_ATTR_FN)
+ *(TFM_SP_ITS_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_ITS$$RO$$Base = ADDR(.TFM_SP_ITS);
- Image$$TFM_SP_ITS$$RO$$Limit = ADDR(.TFM_SP_ITS) + SIZEOF(.TFM_SP_ITS);
- Image$$TFM_SP_ITS$$Base = ADDR(.TFM_SP_ITS);
- Image$$TFM_SP_ITS$$Limit = ADDR(.TFM_SP_ITS) + SIZEOF(.TFM_SP_ITS);
+ Image$$TFM_SP_ITS_LINKER$$RO$$Base = ADDR(.TFM_SP_ITS_LINKER);
+ Image$$TFM_SP_ITS_LINKER$$RO$$Limit = ADDR(.TFM_SP_ITS_LINKER) + SIZEOF(.TFM_SP_ITS_LINKER);
+ Image$$TFM_SP_ITS_LINKER$$Base = ADDR(.TFM_SP_ITS_LINKER);
+ Image$$TFM_SP_ITS_LINKER$$Limit = ADDR(.TFM_SP_ITS_LINKER) + SIZEOF(.TFM_SP_ITS_LINKER);
#ifdef TFM_PARTITION_AUDIT_LOG
- .TFM_SP_AUDIT_LOG : ALIGN(32)
+ .TFM_SP_AUDIT_LOG_LINKER : ALIGN(32)
{
*tfm_audit*:*(.text*)
*tfm_audit*:*(.rodata*)
- *(TFM_SP_AUDIT_LOG_ATTR_FN)
+ *(TFM_SP_AUDIT_LOG_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_AUDIT_LOG$$RO$$Base = ADDR(.TFM_SP_AUDIT_LOG);
- Image$$TFM_SP_AUDIT_LOG$$RO$$Limit = ADDR(.TFM_SP_AUDIT_LOG) + SIZEOF(.TFM_SP_AUDIT_LOG);
- Image$$TFM_SP_AUDIT_LOG$$Base = ADDR(.TFM_SP_AUDIT_LOG);
- Image$$TFM_SP_AUDIT_LOG$$Limit = ADDR(.TFM_SP_AUDIT_LOG) + SIZEOF(.TFM_SP_AUDIT_LOG);
+ Image$$TFM_SP_AUDIT_LOG_LINKER$$RO$$Base = ADDR(.TFM_SP_AUDIT_LOG_LINKER);
+ Image$$TFM_SP_AUDIT_LOG_LINKER$$RO$$Limit = ADDR(.TFM_SP_AUDIT_LOG_LINKER) + SIZEOF(.TFM_SP_AUDIT_LOG_LINKER);
+ Image$$TFM_SP_AUDIT_LOG_LINKER$$Base = ADDR(.TFM_SP_AUDIT_LOG_LINKER);
+ Image$$TFM_SP_AUDIT_LOG_LINKER$$Limit = ADDR(.TFM_SP_AUDIT_LOG_LINKER) + SIZEOF(.TFM_SP_AUDIT_LOG_LINKER);
#endif /* TFM_PARTITION_AUDIT_LOG */
- .TFM_SP_CRYPTO : ALIGN(32)
+ .TFM_SP_CRYPTO_LINKER : ALIGN(32)
{
*tfm_crypto*:*(.text*)
*tfm_crypto*:*(.rodata*)
- *(TFM_SP_CRYPTO_ATTR_FN)
+ *(TFM_SP_CRYPTO_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_CRYPTO$$RO$$Base = ADDR(.TFM_SP_CRYPTO);
- Image$$TFM_SP_CRYPTO$$RO$$Limit = ADDR(.TFM_SP_CRYPTO) + SIZEOF(.TFM_SP_CRYPTO);
- Image$$TFM_SP_CRYPTO$$Base = ADDR(.TFM_SP_CRYPTO);
- Image$$TFM_SP_CRYPTO$$Limit = ADDR(.TFM_SP_CRYPTO) + SIZEOF(.TFM_SP_CRYPTO);
+ Image$$TFM_SP_CRYPTO_LINKER$$RO$$Base = ADDR(.TFM_SP_CRYPTO_LINKER);
+ Image$$TFM_SP_CRYPTO_LINKER$$RO$$Limit = ADDR(.TFM_SP_CRYPTO_LINKER) + SIZEOF(.TFM_SP_CRYPTO_LINKER);
+ Image$$TFM_SP_CRYPTO_LINKER$$Base = ADDR(.TFM_SP_CRYPTO_LINKER);
+ Image$$TFM_SP_CRYPTO_LINKER$$Limit = ADDR(.TFM_SP_CRYPTO_LINKER) + SIZEOF(.TFM_SP_CRYPTO_LINKER);
#ifdef TFM_PARTITION_PLATFORM
- .TFM_SP_PLATFORM : ALIGN(32)
+ .TFM_SP_PLATFORM_LINKER : ALIGN(32)
{
*tfm_platform*:*(.text*)
*tfm_platform*:*(.rodata*)
- *(TFM_SP_PLATFORM_ATTR_FN)
+ *(TFM_SP_PLATFORM_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_PLATFORM$$RO$$Base = ADDR(.TFM_SP_PLATFORM);
- Image$$TFM_SP_PLATFORM$$RO$$Limit = ADDR(.TFM_SP_PLATFORM) + SIZEOF(.TFM_SP_PLATFORM);
- Image$$TFM_SP_PLATFORM$$Base = ADDR(.TFM_SP_PLATFORM);
- Image$$TFM_SP_PLATFORM$$Limit = ADDR(.TFM_SP_PLATFORM) + SIZEOF(.TFM_SP_PLATFORM);
+ Image$$TFM_SP_PLATFORM_LINKER$$RO$$Base = ADDR(.TFM_SP_PLATFORM_LINKER);
+ Image$$TFM_SP_PLATFORM_LINKER$$RO$$Limit = ADDR(.TFM_SP_PLATFORM_LINKER) + SIZEOF(.TFM_SP_PLATFORM_LINKER);
+ Image$$TFM_SP_PLATFORM_LINKER$$Base = ADDR(.TFM_SP_PLATFORM_LINKER);
+ Image$$TFM_SP_PLATFORM_LINKER$$Limit = ADDR(.TFM_SP_PLATFORM_LINKER) + SIZEOF(.TFM_SP_PLATFORM_LINKER);
#endif /* TFM_PARTITION_PLATFORM */
- .TFM_SP_INITIAL_ATTESTATION : ALIGN(32)
+ .TFM_SP_INITIAL_ATTESTATION_LINKER : ALIGN(32)
{
*tfm_attest*:*(.text*)
*tfm_attest*:*(.rodata*)
- *(TFM_SP_INITIAL_ATTESTATION_ATTR_FN)
+ *(TFM_SP_INITIAL_ATTESTATION_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_INITIAL_ATTESTATION$$RO$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION);
- Image$$TFM_SP_INITIAL_ATTESTATION$$RO$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION);
- Image$$TFM_SP_INITIAL_ATTESTATION$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION);
- Image$$TFM_SP_INITIAL_ATTESTATION$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER$$RO$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER$$RO$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER);
#ifdef TFM_PARTITION_TEST_CORE
- .TFM_SP_CORE_TEST : ALIGN(32)
+ .TFM_SP_CORE_TEST_LINKER : ALIGN(32)
{
*tfm_ss_core_test.*(.text*)
*tfm_ss_core_test.*(.rodata*)
- *(TFM_SP_CORE_TEST_ATTR_FN)
+ *(TFM_SP_CORE_TEST_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_CORE_TEST$$RO$$Base = ADDR(.TFM_SP_CORE_TEST);
- Image$$TFM_SP_CORE_TEST$$RO$$Limit = ADDR(.TFM_SP_CORE_TEST) + SIZEOF(.TFM_SP_CORE_TEST);
- Image$$TFM_SP_CORE_TEST$$Base = ADDR(.TFM_SP_CORE_TEST);
- Image$$TFM_SP_CORE_TEST$$Limit = ADDR(.TFM_SP_CORE_TEST) + SIZEOF(.TFM_SP_CORE_TEST);
+ Image$$TFM_SP_CORE_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_CORE_TEST_LINKER);
+ Image$$TFM_SP_CORE_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_CORE_TEST_LINKER) + SIZEOF(.TFM_SP_CORE_TEST_LINKER);
+ Image$$TFM_SP_CORE_TEST_LINKER$$Base = ADDR(.TFM_SP_CORE_TEST_LINKER);
+ Image$$TFM_SP_CORE_TEST_LINKER$$Limit = ADDR(.TFM_SP_CORE_TEST_LINKER) + SIZEOF(.TFM_SP_CORE_TEST_LINKER);
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- .TFM_SP_SECURE_TEST_PARTITION : ALIGN(32)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER : ALIGN(32)
{
*tfm_secure_client_service.*(.text*)
*tfm_secure_client_service.*(.rodata*)
@@ -364,27 +364,27 @@ SECTIONS
*secure_suites.*(.rodata*)
*attestation_s_interface_testsuite.*(.text*)
*attestation_s_interface_testsuite.*(.rodata*)
- *(TFM_SP_SECURE_TEST_PARTITION_ATTR_FN)
+ *(TFM_SP_SECURE_TEST_PARTITION_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_SECURE_TEST_PARTITION$$RO$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION);
- Image$$TFM_SP_SECURE_TEST_PARTITION$$RO$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION);
- Image$$TFM_SP_SECURE_TEST_PARTITION$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION);
- Image$$TFM_SP_SECURE_TEST_PARTITION$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER$$RO$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER$$RO$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER);
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- .TFM_SP_IPC_SERVICE_TEST : ALIGN(32)
+ .TFM_SP_IPC_SERVICE_TEST_LINKER : ALIGN(32)
{
*ipc_service_test.*(.text*)
*ipc_service_test.*(.rodata*)
- *(TFM_SP_IPC_SERVICE_TEST_ATTR_FN)
+ *(TFM_SP_IPC_SERVICE_TEST_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_IPC_SERVICE_TEST$$RO$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST);
- Image$$TFM_SP_IPC_SERVICE_TEST$$RO$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST);
- Image$$TFM_SP_IPC_SERVICE_TEST$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST);
- Image$$TFM_SP_IPC_SERVICE_TEST$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
/**** PSA RoT RO part (CODE + RODATA) end here */
@@ -394,35 +394,35 @@ SECTIONS
Image$$TFM_APP_CODE_START$$Base = .;
#ifdef TFM_PARTITION_TEST_CORE
- .TFM_SP_CORE_TEST_2 : ALIGN(32)
+ .TFM_SP_CORE_TEST_2_LINKER : ALIGN(32)
{
*tfm_ss_core_test_2.*(.text*)
*tfm_ss_core_test_2.*(.rodata*)
*(TFM_SP_CORE_TEST_2_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_CORE_TEST_2$$RO$$Base = ADDR(.TFM_SP_CORE_TEST_2);
- Image$$TFM_SP_CORE_TEST_2$$RO$$Limit = ADDR(.TFM_SP_CORE_TEST_2) + SIZEOF(.TFM_SP_CORE_TEST_2);
- Image$$TFM_SP_CORE_TEST_2$$Base = ADDR(.TFM_SP_CORE_TEST_2);
- Image$$TFM_SP_CORE_TEST_2$$Limit = ADDR(.TFM_SP_CORE_TEST_2) + SIZEOF(.TFM_SP_CORE_TEST_2);
+ Image$$TFM_SP_CORE_TEST_2_LINKER$$RO$$Base = ADDR(.TFM_SP_CORE_TEST_2_LINKER);
+ Image$$TFM_SP_CORE_TEST_2_LINKER$$RO$$Limit = ADDR(.TFM_SP_CORE_TEST_2_LINKER) + SIZEOF(.TFM_SP_CORE_TEST_2_LINKER);
+ Image$$TFM_SP_CORE_TEST_2_LINKER$$Base = ADDR(.TFM_SP_CORE_TEST_2_LINKER);
+ Image$$TFM_SP_CORE_TEST_2_LINKER$$Limit = ADDR(.TFM_SP_CORE_TEST_2_LINKER) + SIZEOF(.TFM_SP_CORE_TEST_2_LINKER);
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- .TFM_SP_IPC_CLIENT_TEST : ALIGN(32)
+ .TFM_SP_IPC_CLIENT_TEST_LINKER : ALIGN(32)
{
*ipc_client_test.*(.text*)
*ipc_client_test.*(.rodata*)
*(TFM_SP_IPC_CLIENT_TEST_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_SP_IPC_CLIENT_TEST$$RO$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST);
- Image$$TFM_SP_IPC_CLIENT_TEST$$RO$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST);
- Image$$TFM_SP_IPC_CLIENT_TEST$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST);
- Image$$TFM_SP_IPC_CLIENT_TEST$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER$$RO$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER$$RO$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
- .TFM_IRQ_TEST_1 : ALIGN(32)
+ .TFM_IRQ_TEST_1_LINKER : ALIGN(32)
{
*tfm_irq_test_service_1.*(.text*)
*tfm_irq_test_service_1.*(.rodata*)
@@ -431,10 +431,10 @@ SECTIONS
*(TFM_IRQ_TEST_1_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$$TFM_IRQ_TEST_1$$RO$$Base = ADDR(.TFM_IRQ_TEST_1);
- Image$$TFM_IRQ_TEST_1$$RO$$Limit = ADDR(.TFM_IRQ_TEST_1) + SIZEOF(.TFM_IRQ_TEST_1);
- Image$$TFM_IRQ_TEST_1$$Base = ADDR(.TFM_IRQ_TEST_1);
- Image$$TFM_IRQ_TEST_1$$Limit = ADDR(.TFM_IRQ_TEST_1) + SIZEOF(.TFM_IRQ_TEST_1);
+ Image$$TFM_IRQ_TEST_1_LINKER$$RO$$Base = ADDR(.TFM_IRQ_TEST_1_LINKER);
+ Image$$TFM_IRQ_TEST_1_LINKER$$RO$$Limit = ADDR(.TFM_IRQ_TEST_1_LINKER) + SIZEOF(.TFM_IRQ_TEST_1_LINKER);
+ Image$$TFM_IRQ_TEST_1_LINKER$$Base = ADDR(.TFM_IRQ_TEST_1_LINKER);
+ Image$$TFM_IRQ_TEST_1_LINKER$$Limit = ADDR(.TFM_IRQ_TEST_1_LINKER) + SIZEOF(.TFM_IRQ_TEST_1_LINKER);
#endif /* TFM_ENABLE_IRQ_TEST */
/**** APPLICATION RoT RO part (CODE + RODATA) end here */
@@ -586,103 +586,103 @@ SECTIONS
Image$$TFM_APP_RW_STACK_START$$Base = .;
#ifdef TFM_PARTITION_TEST_CORE
- .TFM_SP_CORE_TEST_2_DATA : ALIGN(32)
+ .TFM_SP_CORE_TEST_2_LINKER_DATA : ALIGN(32)
{
*tfm_ss_core_test_2.*(.data*)
*(TFM_SP_CORE_TEST_2_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_CORE_TEST_2_DATA$$RW$$Base = ADDR(.TFM_SP_CORE_TEST_2_DATA);
- Image$$TFM_SP_CORE_TEST_2_DATA$$RW$$Limit = ADDR(.TFM_SP_CORE_TEST_2_DATA) + SIZEOF(.TFM_SP_CORE_TEST_2_DATA);
+ Image$$TFM_SP_CORE_TEST_2_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_CORE_TEST_2_LINKER_DATA);
+ Image$$TFM_SP_CORE_TEST_2_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_CORE_TEST_2_LINKER_DATA) + SIZEOF(.TFM_SP_CORE_TEST_2_LINKER_DATA);
- .TFM_SP_CORE_TEST_2_BSS : ALIGN(32)
+ .TFM_SP_CORE_TEST_2_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_CORE_TEST_2 = .;
+ start_of_TFM_SP_CORE_TEST_2_LINKER = .;
*tfm_ss_core_test_2.*(.bss*)
*tfm_ss_core_test_2.*(COMMON)
*(TFM_SP_CORE_TEST_2_ATTR_ZI)
- . += (. - start_of_TFM_SP_CORE_TEST_2) ? 0 : 4;
+ . += (. - start_of_TFM_SP_CORE_TEST_2_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_CORE_TEST_2_DATA$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_BSS);
- Image$$TFM_SP_CORE_TEST_2_DATA$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_BSS) + SIZEOF(.TFM_SP_CORE_TEST_2_BSS);
+ Image$$TFM_SP_CORE_TEST_2_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_LINKER_BSS);
+ Image$$TFM_SP_CORE_TEST_2_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_LINKER_BSS) + SIZEOF(.TFM_SP_CORE_TEST_2_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_CORE_TEST_2_STACK : ALIGN(128)
+ .TFM_SP_CORE_TEST_2_LINKER_STACK : ALIGN(128)
{
. += 0x0200;
} > RAM
- Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_STACK);
- Image$$TFM_SP_CORE_TEST_2_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_STACK) + SIZEOF(.TFM_SP_CORE_TEST_2_STACK);
+ Image$$TFM_SP_CORE_TEST_2_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_2_LINKER_STACK);
+ Image$$TFM_SP_CORE_TEST_2_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_2_LINKER_STACK) + SIZEOF(.TFM_SP_CORE_TEST_2_LINKER_STACK);
#endif
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- .TFM_SP_IPC_CLIENT_TEST_DATA : ALIGN(32)
+ .TFM_SP_IPC_CLIENT_TEST_LINKER_DATA : ALIGN(32)
{
*ipc_client_test.*(.data*)
*(TFM_SP_IPC_CLIENT_TEST_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_IPC_CLIENT_TEST_DATA$$RW$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_DATA);
- Image$$TFM_SP_IPC_CLIENT_TEST_DATA$$RW$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_DATA) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_DATA);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_DATA);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER_DATA);
- .TFM_SP_IPC_CLIENT_TEST_BSS : ALIGN(32)
+ .TFM_SP_IPC_CLIENT_TEST_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_IPC_CLIENT_TEST = .;
+ start_of_TFM_SP_IPC_CLIENT_TEST_LINKER = .;
*ipc_client_test.*(.bss*)
*ipc_client_test.*(COMMON)
*(TFM_SP_IPC_CLIENT_TEST_ATTR_ZI)
- . += (. - start_of_TFM_SP_IPC_CLIENT_TEST) ? 0 : 4;
+ . += (. - start_of_TFM_SP_IPC_CLIENT_TEST_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_IPC_CLIENT_TEST_DATA$$ZI$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_BSS);
- Image$$TFM_SP_IPC_CLIENT_TEST_DATA$$ZI$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_BSS) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_BSS);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_BSS);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_IPC_CLIENT_TEST_STACK : ALIGN(128)
+ .TFM_SP_IPC_CLIENT_TEST_LINKER_STACK : ALIGN(128)
{
. += 0x0220;
} > RAM
- Image$$TFM_SP_IPC_CLIENT_TEST_STACK$$ZI$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_STACK);
- Image$$TFM_SP_IPC_CLIENT_TEST_STACK$$ZI$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_STACK) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_STACK);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK);
+ Image$$TFM_SP_IPC_CLIENT_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_IPC_CLIENT_TEST_LINKER_STACK);
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
- .TFM_IRQ_TEST_1_DATA : ALIGN(32)
+ .TFM_IRQ_TEST_1_LINKER_DATA : ALIGN(32)
{
*tfm_irq_test_service_1.*(.data*)
*timer_cmsdk*(.data*)
*(TFM_IRQ_TEST_1_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_IRQ_TEST_1_DATA$$RW$$Base = ADDR(.TFM_IRQ_TEST_1_DATA);
- Image$$TFM_IRQ_TEST_1_DATA$$RW$$Limit = ADDR(.TFM_IRQ_TEST_1_DATA) + SIZEOF(.TFM_IRQ_TEST_1_DATA);
+ Image$$TFM_IRQ_TEST_1_LINKER_DATA$$RW$$Base = ADDR(.TFM_IRQ_TEST_1_LINKER_DATA);
+ Image$$TFM_IRQ_TEST_1_LINKER_DATA$$RW$$Limit = ADDR(.TFM_IRQ_TEST_1_LINKER_DATA) + SIZEOF(.TFM_IRQ_TEST_1_LINKER_DATA);
- .TFM_IRQ_TEST_1_BSS : ALIGN(32)
+ .TFM_IRQ_TEST_1_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_IRQ_TEST_1 = .;
+ start_of_TFM_IRQ_TEST_1_LINKER = .;
*tfm_irq_test_service_1.*(.bss*)
*tfm_irq_test_service_1.*(COMMON)
*timer_cmsdk*(.bss*)
*timer_cmsdk*(COMMON)
*(TFM_IRQ_TEST_1_ATTR_ZI)
- . += (. - start_of_TFM_IRQ_TEST_1) ? 0 : 4;
+ . += (. - start_of_TFM_IRQ_TEST_1_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_IRQ_TEST_1_DATA$$ZI$$Base = ADDR(.TFM_IRQ_TEST_1_BSS);
- Image$$TFM_IRQ_TEST_1_DATA$$ZI$$Limit = ADDR(.TFM_IRQ_TEST_1_BSS) + SIZEOF(.TFM_IRQ_TEST_1_BSS);
+ Image$$TFM_IRQ_TEST_1_LINKER_DATA$$ZI$$Base = ADDR(.TFM_IRQ_TEST_1_LINKER_BSS);
+ Image$$TFM_IRQ_TEST_1_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_IRQ_TEST_1_LINKER_BSS) + SIZEOF(.TFM_IRQ_TEST_1_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_IRQ_TEST_1_STACK : ALIGN(128)
+ .TFM_IRQ_TEST_1_LINKER_STACK : ALIGN(128)
{
. += 0x0400;
} > RAM
- Image$$TFM_IRQ_TEST_1_STACK$$ZI$$Base = ADDR(.TFM_IRQ_TEST_1_STACK);
- Image$$TFM_IRQ_TEST_1_STACK$$ZI$$Limit = ADDR(.TFM_IRQ_TEST_1_STACK) + SIZEOF(.TFM_IRQ_TEST_1_STACK);
+ Image$$TFM_IRQ_TEST_1_LINKER_STACK$$ZI$$Base = ADDR(.TFM_IRQ_TEST_1_LINKER_STACK);
+ Image$$TFM_IRQ_TEST_1_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_IRQ_TEST_1_LINKER_STACK) + SIZEOF(.TFM_IRQ_TEST_1_LINKER_STACK);
#endif
#endif /* TFM_ENABLE_IRQ_TEST */
@@ -692,13 +692,13 @@ SECTIONS
#if TFM_LVL != 1
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- .TFM_SP_SECURE_TEST_PARTITION_DATA : ALIGN(32)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA : ALIGN(32)
{
*libc_nano*:*(.data*)
. = ALIGN(32);
} > RAM AT> FLASH
- .TFM_SP_SECURE_TEST_PARTITION_BSS : ALIGN(32)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS : ALIGN(32)
{
/* FixMe:
* Test framework use printf to print out test result. Implementation of
@@ -775,215 +775,215 @@ SECTIONS
/**** PSA RoT DATA start here */
Image$$TFM_PSA_RW_STACK_START$$Base = .;
- .TFM_SP_STORAGE_DATA : ALIGN(32)
+ .TFM_SP_STORAGE_LINKER_DATA : ALIGN(32)
{
*tfm_storage*:*(.data*)
*(TFM_SP_STORAGE_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_STORAGE_DATA$$RW$$Base = ADDR(.TFM_SP_STORAGE_DATA);
- Image$$TFM_SP_STORAGE_DATA$$RW$$Limit = ADDR(.TFM_SP_STORAGE_DATA) + SIZEOF(.TFM_SP_STORAGE_DATA);
+ Image$$TFM_SP_STORAGE_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_STORAGE_LINKER_DATA);
+ Image$$TFM_SP_STORAGE_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_DATA) + SIZEOF(.TFM_SP_STORAGE_LINKER_DATA);
- .TFM_SP_STORAGE_BSS : ALIGN(32)
+ .TFM_SP_STORAGE_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_STORAGE = .;
+ start_of_TFM_SP_STORAGE_LINKER = .;
*tfm_storage*:*(.bss*)
*tfm_storage*:*(COMMON)
*(TFM_SP_STORAGE_ATTR_ZI)
- . += (. - start_of_TFM_SP_STORAGE) ? 0 : 4;
+ . += (. - start_of_TFM_SP_STORAGE_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_STORAGE_DATA$$ZI$$Base = ADDR(.TFM_SP_STORAGE_BSS);
- Image$$TFM_SP_STORAGE_DATA$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_BSS) + SIZEOF(.TFM_SP_STORAGE_BSS);
+ Image$$TFM_SP_STORAGE_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_STORAGE_LINKER_BSS);
+ Image$$TFM_SP_STORAGE_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_BSS) + SIZEOF(.TFM_SP_STORAGE_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_STORAGE_STACK : ALIGN(128)
+ .TFM_SP_STORAGE_LINKER_STACK : ALIGN(128)
{
. += 0xA00;
} > RAM
- Image$$TFM_SP_STORAGE_STACK$$ZI$$Base = ADDR(.TFM_SP_STORAGE_STACK);
- Image$$TFM_SP_STORAGE_STACK$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_STACK) + SIZEOF(.TFM_SP_STORAGE_STACK);
+ Image$$TFM_SP_STORAGE_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_STORAGE_LINKER_STACK);
+ Image$$TFM_SP_STORAGE_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_STORAGE_LINKER_STACK) + SIZEOF(.TFM_SP_STORAGE_LINKER_STACK);
#endif
- .TFM_SP_ITS_DATA : ALIGN(32)
+ .TFM_SP_ITS_LINKER_DATA : ALIGN(32)
{
*tfm_internal_trusted_storage*:*(.data*)
*(TFM_SP_ITS_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_ITS_DATA$$RW$$Base = ADDR(.TFM_SP_ITS_DATA);
- Image$$TFM_SP_ITS_DATA$$RW$$Limit = ADDR(.TFM_SP_ITS_DATA) + SIZEOF(.TFM_SP_ITS_DATA);
+ Image$$TFM_SP_ITS_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_ITS_LINKER_DATA);
+ Image$$TFM_SP_ITS_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_ITS_LINKER_DATA) + SIZEOF(.TFM_SP_ITS_LINKER_DATA);
- .TFM_SP_ITS_BSS : ALIGN(32)
+ .TFM_SP_ITS_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_ITS = .;
+ start_of_TFM_SP_ITS_LINKER = .;
*tfm_internal_trusted_storage*:*(.bss*)
*tfm_internal_trusted_storage*:*(COMMON)
*(TFM_SP_ITS_ATTR_ZI)
- . += (. - start_of_TFM_SP_ITS) ? 0 : 4;
+ . += (. - start_of_TFM_SP_ITS_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_ITS_DATA$$ZI$$Base = ADDR(.TFM_SP_ITS_BSS);
- Image$$TFM_SP_ITS_DATA$$ZI$$Limit = ADDR(.TFM_SP_ITS_BSS) + SIZEOF(.TFM_SP_ITS_BSS);
+ Image$$TFM_SP_ITS_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_ITS_LINKER_BSS);
+ Image$$TFM_SP_ITS_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_ITS_LINKER_BSS) + SIZEOF(.TFM_SP_ITS_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_ITS_STACK : ALIGN(128)
+ .TFM_SP_ITS_LINKER_STACK : ALIGN(128)
{
. += 0x500;
} > RAM
- Image$$TFM_SP_ITS_STACK$$ZI$$Base = ADDR(.TFM_SP_ITS_STACK);
- Image$$TFM_SP_ITS_STACK$$ZI$$Limit = ADDR(.TFM_SP_ITS_STACK) + SIZEOF(.TFM_SP_ITS_STACK);
+ Image$$TFM_SP_ITS_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_ITS_LINKER_STACK);
+ Image$$TFM_SP_ITS_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_ITS_LINKER_STACK) + SIZEOF(.TFM_SP_ITS_LINKER_STACK);
#endif
#ifdef TFM_PARTITION_AUDIT_LOG
- .TFM_SP_AUDIT_LOG_DATA : ALIGN(32)
+ .TFM_SP_AUDIT_LOG_LINKER_DATA : ALIGN(32)
{
*tfm_audit*:*(.data*)
*(TFM_SP_AUDIT_LOG_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_AUDIT_LOG_DATA$$RW$$Base = ADDR(.TFM_SP_AUDIT_LOG_DATA);
- Image$$TFM_SP_AUDIT_LOG_DATA$$RW$$Limit = ADDR(.TFM_SP_AUDIT_LOG_DATA) + SIZEOF(.TFM_SP_AUDIT_LOG_DATA);
+ Image$$TFM_SP_AUDIT_LOG_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_AUDIT_LOG_LINKER_DATA);
+ Image$$TFM_SP_AUDIT_LOG_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_AUDIT_LOG_LINKER_DATA) + SIZEOF(.TFM_SP_AUDIT_LOG_LINKER_DATA);
- .TFM_SP_AUDIT_LOG_BSS : ALIGN(32)
+ .TFM_SP_AUDIT_LOG_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_AUDIT_LOG = .;
+ start_of_TFM_SP_AUDIT_LOG_LINKER = .;
*tfm_audit*:*(.bss*)
*tfm_audit*:*(COMMON)
*(TFM_SP_AUDIT_LOG_ATTR_ZI)
- . += (. - start_of_TFM_SP_AUDIT_LOG) ? 0 : 4;
+ . += (. - start_of_TFM_SP_AUDIT_LOG_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_AUDIT_LOG_DATA$$ZI$$Base = ADDR(.TFM_SP_AUDIT_LOG_BSS);
- Image$$TFM_SP_AUDIT_LOG_DATA$$ZI$$Limit = ADDR(.TFM_SP_AUDIT_LOG_BSS) + SIZEOF(.TFM_SP_AUDIT_LOG_BSS);
+ Image$$TFM_SP_AUDIT_LOG_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_AUDIT_LOG_LINKER_BSS);
+ Image$$TFM_SP_AUDIT_LOG_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_AUDIT_LOG_LINKER_BSS) + SIZEOF(.TFM_SP_AUDIT_LOG_LINKER_BSS);
#endif /* TFM_PARTITION_AUDIT_LOG */
- .TFM_SP_CRYPTO_DATA : ALIGN(32)
+ .TFM_SP_CRYPTO_LINKER_DATA : ALIGN(32)
{
*tfm_crypto*:*(.data*)
*(TFM_SP_CRYPTO_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_CRYPTO_DATA$$RW$$Base = ADDR(.TFM_SP_CRYPTO_DATA);
- Image$$TFM_SP_CRYPTO_DATA$$RW$$Limit = ADDR(.TFM_SP_CRYPTO_DATA) + SIZEOF(.TFM_SP_CRYPTO_DATA);
+ Image$$TFM_SP_CRYPTO_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_CRYPTO_LINKER_DATA);
+ Image$$TFM_SP_CRYPTO_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_CRYPTO_LINKER_DATA) + SIZEOF(.TFM_SP_CRYPTO_LINKER_DATA);
- .TFM_SP_CRYPTO_BSS : ALIGN(32)
+ .TFM_SP_CRYPTO_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_CRYPTO = .;
+ start_of_TFM_SP_CRYPTO_LINKER = .;
*tfm_crypto*:*(.bss*)
*tfm_crypto*:*(COMMON)
*(TFM_SP_CRYPTO_ATTR_ZI)
- . += (. - start_of_TFM_SP_CRYPTO) ? 0 : 4;
+ . += (. - start_of_TFM_SP_CRYPTO_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_CRYPTO_DATA$$ZI$$Base = ADDR(.TFM_SP_CRYPTO_BSS);
- Image$$TFM_SP_CRYPTO_DATA$$ZI$$Limit = ADDR(.TFM_SP_CRYPTO_BSS) + SIZEOF(.TFM_SP_CRYPTO_BSS);
+ Image$$TFM_SP_CRYPTO_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_CRYPTO_LINKER_BSS);
+ Image$$TFM_SP_CRYPTO_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_CRYPTO_LINKER_BSS) + SIZEOF(.TFM_SP_CRYPTO_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_CRYPTO_STACK : ALIGN(128)
+ .TFM_SP_CRYPTO_LINKER_STACK : ALIGN(128)
{
. += 0x2000;
} > RAM
- Image$$TFM_SP_CRYPTO_STACK$$ZI$$Base = ADDR(.TFM_SP_CRYPTO_STACK);
- Image$$TFM_SP_CRYPTO_STACK$$ZI$$Limit = ADDR(.TFM_SP_CRYPTO_STACK) + SIZEOF(.TFM_SP_CRYPTO_STACK);
+ Image$$TFM_SP_CRYPTO_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_CRYPTO_LINKER_STACK);
+ Image$$TFM_SP_CRYPTO_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_CRYPTO_LINKER_STACK) + SIZEOF(.TFM_SP_CRYPTO_LINKER_STACK);
#endif
#ifdef TFM_PARTITION_PLATFORM
- .TFM_SP_PLATFORM_DATA : ALIGN(32)
+ .TFM_SP_PLATFORM_LINKER_DATA : ALIGN(32)
{
*tfm_platform*:*(.data*)
*(TFM_SP_PLATFORM_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_PLATFORM_DATA$$RW$$Base = ADDR(.TFM_SP_PLATFORM_DATA);
- Image$$TFM_SP_PLATFORM_DATA$$RW$$Limit = ADDR(.TFM_SP_PLATFORM_DATA) + SIZEOF(.TFM_SP_PLATFORM_DATA);
+ Image$$TFM_SP_PLATFORM_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_PLATFORM_LINKER_DATA);
+ Image$$TFM_SP_PLATFORM_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_PLATFORM_LINKER_DATA) + SIZEOF(.TFM_SP_PLATFORM_LINKER_DATA);
- .TFM_SP_PLATFORM_BSS : ALIGN(32)
+ .TFM_SP_PLATFORM_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_PLATFORM = .;
+ start_of_TFM_SP_PLATFORM_LINKER = .;
*tfm_platform*:*(.bss*)
*tfm_platform*:*(COMMON)
*(TFM_SP_PLATFORM_ATTR_ZI)
- . += (. - start_of_TFM_SP_PLATFORM) ? 0 : 4;
+ . += (. - start_of_TFM_SP_PLATFORM_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_PLATFORM_DATA$$ZI$$Base = ADDR(.TFM_SP_PLATFORM_BSS);
- Image$$TFM_SP_PLATFORM_DATA$$ZI$$Limit = ADDR(.TFM_SP_PLATFORM_BSS) + SIZEOF(.TFM_SP_PLATFORM_BSS);
+ Image$$TFM_SP_PLATFORM_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_PLATFORM_LINKER_BSS);
+ Image$$TFM_SP_PLATFORM_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_PLATFORM_LINKER_BSS) + SIZEOF(.TFM_SP_PLATFORM_LINKER_BSS);
#endif /* TFM_PARTITION_PLATFORM */
- .TFM_SP_INITIAL_ATTESTATION_DATA : ALIGN(32)
+ .TFM_SP_INITIAL_ATTESTATION_LINKER_DATA : ALIGN(32)
{
*tfm_attest*:*(.data*)
*(TFM_SP_INITIAL_ATTESTATION_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_INITIAL_ATTESTATION_DATA$$RW$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_DATA);
- Image$$TFM_SP_INITIAL_ATTESTATION_DATA$$RW$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_DATA) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_DATA);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_DATA);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_DATA) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER_DATA);
- .TFM_SP_INITIAL_ATTESTATION_BSS : ALIGN(32)
+ .TFM_SP_INITIAL_ATTESTATION_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_INITIAL_ATTESTATION = .;
+ start_of_TFM_SP_INITIAL_ATTESTATION_LINKER = .;
*tfm_attest*:*(.bss*)
*tfm_attest*:*(COMMON)
*(TFM_SP_INITIAL_ATTESTATION_ATTR_ZI)
- . += (. - start_of_TFM_SP_INITIAL_ATTESTATION) ? 0 : 4;
+ . += (. - start_of_TFM_SP_INITIAL_ATTESTATION_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_INITIAL_ATTESTATION_DATA$$ZI$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_BSS);
- Image$$TFM_SP_INITIAL_ATTESTATION_DATA$$ZI$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_BSS) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_BSS);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_BSS);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_BSS) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_INITIAL_ATTESTATION_STACK : ALIGN(128)
+ .TFM_SP_INITIAL_ATTESTATION_LINKER_STACK : ALIGN(128)
{
. += 0x0A00;
} > RAM
- Image$$TFM_SP_INITIAL_ATTESTATION_STACK$$ZI$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_STACK);
- Image$$TFM_SP_INITIAL_ATTESTATION_STACK$$ZI$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_STACK) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_STACK);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_STACK);
+ Image$$TFM_SP_INITIAL_ATTESTATION_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_INITIAL_ATTESTATION_LINKER_STACK) + SIZEOF(.TFM_SP_INITIAL_ATTESTATION_LINKER_STACK);
#endif
#ifdef TFM_PARTITION_TEST_CORE
- .TFM_SP_CORE_TEST_DATA : ALIGN(32)
+ .TFM_SP_CORE_TEST_LINKER_DATA : ALIGN(32)
{
*tfm_ss_core_test.*(.data*)
*(TFM_SP_CORE_TEST_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_CORE_TEST_DATA$$RW$$Base = ADDR(.TFM_SP_CORE_TEST_DATA);
- Image$$TFM_SP_CORE_TEST_DATA$$RW$$Limit = ADDR(.TFM_SP_CORE_TEST_DATA) + SIZEOF(.TFM_SP_CORE_TEST_DATA);
+ Image$$TFM_SP_CORE_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_CORE_TEST_LINKER_DATA);
+ Image$$TFM_SP_CORE_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_CORE_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_CORE_TEST_LINKER_DATA);
- .TFM_SP_CORE_TEST_BSS : ALIGN(32)
+ .TFM_SP_CORE_TEST_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_CORE_TEST = .;
+ start_of_TFM_SP_CORE_TEST_LINKER = .;
*tfm_ss_core_test.*(.bss*)
*tfm_ss_core_test.*(COMMON)
*(TFM_SP_CORE_TEST_ATTR_ZI)
- . += (. - start_of_TFM_SP_CORE_TEST) ? 0 : 4;
+ . += (. - start_of_TFM_SP_CORE_TEST_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_CORE_TEST_DATA$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_BSS);
- Image$$TFM_SP_CORE_TEST_DATA$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_BSS) + SIZEOF(.TFM_SP_CORE_TEST_BSS);
+ Image$$TFM_SP_CORE_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_LINKER_BSS);
+ Image$$TFM_SP_CORE_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_CORE_TEST_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_CORE_TEST_STACK : ALIGN(128)
+ .TFM_SP_CORE_TEST_LINKER_STACK : ALIGN(128)
{
. += 0x0300;
} > RAM
- Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_STACK);
- Image$$TFM_SP_CORE_TEST_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_STACK) + SIZEOF(.TFM_SP_CORE_TEST_STACK);
+ Image$$TFM_SP_CORE_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_CORE_TEST_LINKER_STACK);
+ Image$$TFM_SP_CORE_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_CORE_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_CORE_TEST_LINKER_STACK);
#endif
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- .TFM_SP_SECURE_TEST_PARTITION_DATA : ALIGN(32)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA : ALIGN(32)
{
*tfm_secure_client_service.*(.data*)
*test_framework*(.data*)
@@ -997,12 +997,12 @@ SECTIONS
*(TFM_SP_SECURE_TEST_PARTITION_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_SECURE_TEST_PARTITION_DATA$$RW$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_DATA);
- Image$$TFM_SP_SECURE_TEST_PARTITION_DATA$$RW$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_DATA) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_DATA);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA);
- .TFM_SP_SECURE_TEST_PARTITION_BSS : ALIGN(32)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_SECURE_TEST_PARTITION = .;
+ start_of_TFM_SP_SECURE_TEST_PARTITION_LINKER = .;
*tfm_secure_client_service.*(.bss*)
*tfm_secure_client_service.*(COMMON)
*test_framework*(.bss*)
@@ -1022,52 +1022,52 @@ SECTIONS
*attestation_s_interface_testsuite.*(.bss*)
*attestation_s_interface_testsuite.*(COMMON)
*(TFM_SP_SECURE_TEST_PARTITION_ATTR_ZI)
- . += (. - start_of_TFM_SP_SECURE_TEST_PARTITION) ? 0 : 4;
+ . += (. - start_of_TFM_SP_SECURE_TEST_PARTITION_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_SECURE_TEST_PARTITION_DATA$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_BSS);
- Image$$TFM_SP_SECURE_TEST_PARTITION_DATA$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_BSS) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_BSS);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_SECURE_TEST_PARTITION_STACK : ALIGN(128)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK : ALIGN(128)
{
. += 0x0C00;
} > RAM
- Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK);
- Image$$TFM_SP_SECURE_TEST_PARTITION_STACK$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_STACK) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_STACK);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK);
+ Image$$TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK) + SIZEOF(.TFM_SP_SECURE_TEST_PARTITION_LINKER_STACK);
#endif
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
- .TFM_SP_IPC_SERVICE_TEST_DATA : ALIGN(32)
+ .TFM_SP_IPC_SERVICE_TEST_LINKER_DATA : ALIGN(32)
{
*ipc_service_test.*(.data*)
*(TFM_SP_IPC_SERVICE_TEST_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$$TFM_SP_IPC_SERVICE_TEST_DATA$$RW$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_DATA);
- Image$$TFM_SP_IPC_SERVICE_TEST_DATA$$RW$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_DATA) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_DATA);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER_DATA$$RW$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_DATA);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER_DATA$$RW$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_DATA) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER_DATA);
- .TFM_SP_IPC_SERVICE_TEST_BSS : ALIGN(32)
+ .TFM_SP_IPC_SERVICE_TEST_LINKER_BSS : ALIGN(32)
{
- start_of_TFM_SP_IPC_SERVICE_TEST = .;
+ start_of_TFM_SP_IPC_SERVICE_TEST_LINKER = .;
*ipc_service_test.*(.bss*)
*ipc_service_test.*(COMMON)
*(TFM_SP_IPC_SERVICE_TEST_ATTR_ZI)
- . += (. - start_of_TFM_SP_IPC_SERVICE_TEST) ? 0 : 4;
+ . += (. - start_of_TFM_SP_IPC_SERVICE_TEST_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$$TFM_SP_IPC_SERVICE_TEST_DATA$$ZI$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_BSS);
- Image$$TFM_SP_IPC_SERVICE_TEST_DATA$$ZI$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_BSS) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_BSS);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER_DATA$$ZI$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_BSS);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER_DATA$$ZI$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_BSS) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER_BSS);
#if defined (TFM_PSA_API)
- .TFM_SP_IPC_SERVICE_TEST_STACK : ALIGN(128)
+ .TFM_SP_IPC_SERVICE_TEST_LINKER_STACK : ALIGN(128)
{
. += 0x0220;
} > RAM
- Image$$TFM_SP_IPC_SERVICE_TEST_STACK$$ZI$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_STACK);
- Image$$TFM_SP_IPC_SERVICE_TEST_STACK$$ZI$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_STACK) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_STACK);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER_STACK$$ZI$$Base = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_STACK);
+ Image$$TFM_SP_IPC_SERVICE_TEST_LINKER_STACK$$ZI$$Limit = ADDR(.TFM_SP_IPC_SERVICE_TEST_LINKER_STACK) + SIZEOF(.TFM_SP_IPC_SERVICE_TEST_LINKER_STACK);
#endif
#endif /* TFM_PARTITION_TEST_CORE_IPC */
diff --git a/platform/ext/common/gcc/tfm_common_s.ld.template b/platform/ext/common/gcc/tfm_common_s.ld.template
index d31dc54560..f2b58993ee 100644
--- a/platform/ext/common/gcc/tfm_common_s.ld.template
+++ b/platform/ext/common/gcc/tfm_common_s.ld.template
@@ -68,9 +68,9 @@ SECTIONS
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- LONG (LOADADDR(.{{manifest.manifest.name}}_DATA))
- LONG (ADDR(.{{manifest.manifest.name}}_DATA))
- LONG (SIZEOF(.{{manifest.manifest.name}}_DATA))
+ LONG (LOADADDR(.{{manifest.manifest.name}}_LINKER_DATA))
+ LONG (ADDR(.{{manifest.manifest.name}}_LINKER_DATA))
+ LONG (SIZEOF(.{{manifest.manifest.name}}_LINKER_DATA))
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
{% endif %}
@@ -96,11 +96,11 @@ SECTIONS
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- LONG (ADDR(.{{manifest.manifest.name}}_BSS))
- LONG (SIZEOF(.{{manifest.manifest.name}}_BSS))
+ LONG (ADDR(.{{manifest.manifest.name}}_LINKER_BSS))
+ LONG (SIZEOF(.{{manifest.manifest.name}}_LINKER_BSS))
#if defined(TFM_PSA_API)
- LONG (ADDR(.{{manifest.manifest.name}}_STACK))
- LONG (SIZEOF(.{{manifest.manifest.name}}_STACK))
+ LONG (ADDR(.{{manifest.manifest.name}}_LINKER_STACK))
+ LONG (SIZEOF(.{{manifest.manifest.name}}_LINKER_STACK))
#endif
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
@@ -143,7 +143,7 @@ SECTIONS
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- .{{manifest.manifest.name}} : ALIGN(32)
+ .{{manifest.manifest.name}}_LINKER : ALIGN(32)
{
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
@@ -157,13 +157,13 @@ SECTIONS
{{pattern}}(.rodata*)
{% endfor %}
{% endif %}
- *({{manifest.manifest.name}}_ATTR_FN)
+ *({{manifest.manifest.name}}_LD_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$${{manifest.manifest.name}}$$RO$$Base = ADDR(.{{manifest.manifest.name}});
- Image$${{manifest.manifest.name}}$$RO$$Limit = ADDR(.{{manifest.manifest.name}}) + SIZEOF(.{{manifest.manifest.name}});
- Image$${{manifest.manifest.name}}$$Base = ADDR(.{{manifest.manifest.name}});
- Image$${{manifest.manifest.name}}$$Limit = ADDR(.{{manifest.manifest.name}}) + SIZEOF(.{{manifest.manifest.name}});
+ Image$${{manifest.manifest.name}}_LINKER$$RO$$Base = ADDR(.{{manifest.manifest.name}}_LINKER);
+ Image$${{manifest.manifest.name}}_LINKER$$RO$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER) + SIZEOF(.{{manifest.manifest.name}}_LINKER);
+ Image$${{manifest.manifest.name}}_LINKER$$Base = ADDR(.{{manifest.manifest.name}}_LINKER);
+ Image$${{manifest.manifest.name}}_LINKER$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER) + SIZEOF(.{{manifest.manifest.name}}_LINKER);
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
{% endif %}
@@ -181,7 +181,7 @@ SECTIONS
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- .{{manifest.manifest.name}} : ALIGN(32)
+ .{{manifest.manifest.name}}_LINKER : ALIGN(32)
{
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
@@ -198,10 +198,10 @@ SECTIONS
*({{manifest.manifest.name}}_ATTR_FN)
. = ALIGN(32);
} > FLASH
- Image$${{manifest.manifest.name}}$$RO$$Base = ADDR(.{{manifest.manifest.name}});
- Image$${{manifest.manifest.name}}$$RO$$Limit = ADDR(.{{manifest.manifest.name}}) + SIZEOF(.{{manifest.manifest.name}});
- Image$${{manifest.manifest.name}}$$Base = ADDR(.{{manifest.manifest.name}});
- Image$${{manifest.manifest.name}}$$Limit = ADDR(.{{manifest.manifest.name}}) + SIZEOF(.{{manifest.manifest.name}});
+ Image$${{manifest.manifest.name}}_LINKER$$RO$$Base = ADDR(.{{manifest.manifest.name}}_LINKER);
+ Image$${{manifest.manifest.name}}_LINKER$$RO$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER) + SIZEOF(.{{manifest.manifest.name}}_LINKER);
+ Image$${{manifest.manifest.name}}_LINKER$$Base = ADDR(.{{manifest.manifest.name}}_LINKER);
+ Image$${{manifest.manifest.name}}_LINKER$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER) + SIZEOF(.{{manifest.manifest.name}}_LINKER);
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
{% endif %}
@@ -361,7 +361,7 @@ SECTIONS
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- .{{manifest.manifest.name}}_DATA : ALIGN(32)
+ .{{manifest.manifest.name}}_LINKER_DATA : ALIGN(32)
{
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
@@ -376,12 +376,12 @@ SECTIONS
*({{manifest.manifest.name}}_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$${{manifest.manifest.name}}_DATA$$RW$$Base = ADDR(.{{manifest.manifest.name}}_DATA);
- Image$${{manifest.manifest.name}}_DATA$$RW$$Limit = ADDR(.{{manifest.manifest.name}}_DATA) + SIZEOF(.{{manifest.manifest.name}}_DATA);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$RW$$Base = ADDR(.{{manifest.manifest.name}}_LINKER_DATA);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$RW$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER_DATA) + SIZEOF(.{{manifest.manifest.name}}_LINKER_DATA);
- .{{manifest.manifest.name}}_BSS : ALIGN(32)
+ .{{manifest.manifest.name}}_LINKER_BSS : ALIGN(32)
{
- start_of_{{manifest.manifest.name}} = .;
+ start_of_{{manifest.manifest.name}}_LINKER = .;
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.bss*)
@@ -395,20 +395,20 @@ SECTIONS
{% endfor %}
{% endif %}
*({{manifest.manifest.name}}_ATTR_ZI)
- . += (. - start_of_{{manifest.manifest.name}}) ? 0 : 4;
+ . += (. - start_of_{{manifest.manifest.name}}_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$${{manifest.manifest.name}}_DATA$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_BSS);
- Image$${{manifest.manifest.name}}_DATA$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_BSS) + SIZEOF(.{{manifest.manifest.name}}_BSS);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_LINKER_BSS);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER_BSS) + SIZEOF(.{{manifest.manifest.name}}_LINKER_BSS);
{% if manifest.attr.tfm_partition_ipc %}
#if defined (TFM_PSA_API)
- .{{manifest.manifest.name}}_STACK : ALIGN(128)
+ .{{manifest.manifest.name}}_LINKER_STACK : ALIGN(128)
{
. += {{manifest.manifest.stack_size}};
} > RAM
- Image$${{manifest.manifest.name}}_STACK$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_STACK);
- Image$${{manifest.manifest.name}}_STACK$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_STACK) + SIZEOF(.{{manifest.manifest.name}}_STACK);
+ Image$${{manifest.manifest.name}}_LINKER_STACK$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_LINKER_STACK);
+ Image$${{manifest.manifest.name}}_LINKER_STACK$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER_STACK) + SIZEOF(.{{manifest.manifest.name}}_LINKER_STACK);
#endif
{% endif %}
@@ -423,13 +423,13 @@ SECTIONS
#if TFM_LVL != 1
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
- .TFM_SP_SECURE_TEST_PARTITION_DATA : ALIGN(32)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER_DATA : ALIGN(32)
{
*libc_nano*:*(.data*)
. = ALIGN(32);
} > RAM AT> FLASH
- .TFM_SP_SECURE_TEST_PARTITION_BSS : ALIGN(32)
+ .TFM_SP_SECURE_TEST_PARTITION_LINKER_BSS : ALIGN(32)
{
/* FixMe:
* Test framework use printf to print out test result. Implementation of
@@ -511,7 +511,7 @@ SECTIONS
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
- .{{manifest.manifest.name}}_DATA : ALIGN(32)
+ .{{manifest.manifest.name}}_LINKER_DATA : ALIGN(32)
{
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
@@ -526,12 +526,12 @@ SECTIONS
*({{manifest.manifest.name}}_ATTR_RW)
. = ALIGN(32);
} > RAM AT> FLASH
- Image$${{manifest.manifest.name}}_DATA$$RW$$Base = ADDR(.{{manifest.manifest.name}}_DATA);
- Image$${{manifest.manifest.name}}_DATA$$RW$$Limit = ADDR(.{{manifest.manifest.name}}_DATA) + SIZEOF(.{{manifest.manifest.name}}_DATA);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$RW$$Base = ADDR(.{{manifest.manifest.name}}_LINKER_DATA);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$RW$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER_DATA) + SIZEOF(.{{manifest.manifest.name}}_LINKER_DATA);
- .{{manifest.manifest.name}}_BSS : ALIGN(32)
+ .{{manifest.manifest.name}}_LINKER_BSS : ALIGN(32)
{
- start_of_{{manifest.manifest.name}} = .;
+ start_of_{{manifest.manifest.name}}_LINKER = .;
{% if manifest.manifest.linker_pattern.library_list %}
{% for pattern in manifest.manifest.linker_pattern.library_list %}
{{pattern}}:*(.bss*)
@@ -545,20 +545,20 @@ SECTIONS
{% endfor %}
{% endif %}
*({{manifest.manifest.name}}_ATTR_ZI)
- . += (. - start_of_{{manifest.manifest.name}}) ? 0 : 4;
+ . += (. - start_of_{{manifest.manifest.name}}_LINKER) ? 0 : 4;
. = ALIGN(32);
} > RAM AT> RAM
- Image$${{manifest.manifest.name}}_DATA$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_BSS);
- Image$${{manifest.manifest.name}}_DATA$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_BSS) + SIZEOF(.{{manifest.manifest.name}}_BSS);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_LINKER_BSS);
+ Image$${{manifest.manifest.name}}_LINKER_DATA$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER_BSS) + SIZEOF(.{{manifest.manifest.name}}_LINKER_BSS);
{% if manifest.attr.tfm_partition_ipc %}
#if defined (TFM_PSA_API)
- .{{manifest.manifest.name}}_STACK : ALIGN(128)
+ .{{manifest.manifest.name}}_LINKER_STACK : ALIGN(128)
{
. += {{manifest.manifest.stack_size}};
} > RAM
- Image$${{manifest.manifest.name}}_STACK$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_STACK);
- Image$${{manifest.manifest.name}}_STACK$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_STACK) + SIZEOF(.{{manifest.manifest.name}}_STACK);
+ Image$${{manifest.manifest.name}}_LINKER_STACK$$ZI$$Base = ADDR(.{{manifest.manifest.name}}_LINKER_STACK);
+ Image$${{manifest.manifest.name}}_LINKER_STACK$$ZI$$Limit = ADDR(.{{manifest.manifest.name}}_LINKER_STACK) + SIZEOF(.{{manifest.manifest.name}}_LINKER_STACK);
#endif
{% endif %}
diff --git a/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc b/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc
index 0bdf2038be..2451b2245e 100644
--- a/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc
+++ b/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc
@@ -24,7 +24,7 @@
/* Definitions of the signals of the IRQs (if any) */
const struct tfm_core_irq_signal_data_t tfm_core_irq_signals[] = {
#ifdef TFM_ENABLE_IRQ_TEST
- { TFM_IRQ_TEST_1_ID, SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ, TFM_TIMER0_IRQ, 64 },
+ { TFM_IRQ_TEST_1, SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ, TFM_TIMER0_IRQ, 64 },
#endif /* TFM_ENABLE_IRQ_TEST */
};
@@ -39,7 +39,7 @@ void TFM_TIMER0_IRQ_Handler(void)
/* It is OK to call tfm_irq_handler directly from here, as we are already
* in handler mode, and we will not be pre-empted as we disabled interrupts
*/
- tfm_irq_handler(TFM_IRQ_TEST_1_ID, SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ, TFM_TIMER0_IRQ);
+ tfm_irq_handler(TFM_IRQ_TEST_1, SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ, TFM_TIMER0_IRQ);
__enable_irq();
}
diff --git a/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc.template b/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc.template
index 18ad0cd8b7..0bf4415d8f 100644
--- a/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc.template
+++ b/secure_fw/core/ipc/tfm_secure_irq_handlers_ipc.inc.template
@@ -12,7 +12,7 @@
{% endfor %}
#include "cmsis_compiler.h"
{% macro _irq_record(partition_name, signal, line, priority) -%}
-{ {{ partition_name }}_ID, {{ signal }}, {{ line }}, {{ priority }} },
+{ {{ partition_name }}, {{ signal }}, {{ line }}, {{ priority }} },
{%- endmacro %}
/* Definitions of the signals of the IRQs (if any) */
@@ -66,7 +66,7 @@ void {{handler.source}}_Handler(void)
* in handler mode, and we will not be pre-empted as we disabled interrupts
*/
{% if handler.source %}
- tfm_irq_handler({{manifest.manifest.name}}_ID, {{handler.signal}}, {{handler.source}});
+ tfm_irq_handler({{manifest.manifest.name}}, {{handler.signal}}, {{handler.source}});
{% else %}
#error "Interrupt source isn't provided for 'irqs' in partition {{manifest.manifest.name}}"
{% endif %}
diff --git a/secure_fw/core/tfm_boot_data.c b/secure_fw/core/tfm_boot_data.c
index a41ca3db53..d477f04599 100644
--- a/secure_fw/core/tfm_boot_data.c
+++ b/secure_fw/core/tfm_boot_data.c
@@ -69,7 +69,7 @@ struct boot_data_access_policy {
* (identified by major_type).
*/
static const struct boot_data_access_policy access_policy_table[] = {
- {TFM_SP_INITIAL_ATTESTATION_ID, TLV_MAJOR_IAS},
+ {TFM_SP_INITIAL_ATTESTATION, TLV_MAJOR_IAS},
};
/*!
diff --git a/secure_fw/core/tfm_secure_irq_handlers.inc b/secure_fw/core/tfm_secure_irq_handlers.inc
index a48dcec936..4c60c38468 100644
--- a/secure_fw/core/tfm_secure_irq_handlers.inc
+++ b/secure_fw/core/tfm_secure_irq_handlers.inc
@@ -19,12 +19,12 @@
#include "test/test_services/tfm_ipc_service/psa_manifest/tfm_ipc_service_partition.h"
#include "test/test_services/tfm_ipc_client/psa_manifest/tfm_ipc_client_partition.h"
#include "test/test_services/tfm_irq_test_service_1/psa_manifest/tfm_irq_test_service_1.h"
-#include "secure_fw/services/tfm_partition_defs.inc"
+#include "psa_manifest/pid.h"
/* Definitions of the signals of the IRQs */
const struct tfm_core_irq_signal_data_t tfm_core_irq_signals[] = {
#ifdef TFM_ENABLE_IRQ_TEST
- { TFM_IRQ_TEST_1_ID, SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ, TFM_TIMER0_IRQ, 64 },
+ { TFM_IRQ_TEST_1, SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ, TFM_TIMER0_IRQ, 64 },
#endif /* TFM_ENABLE_IRQ_TEST */
};
@@ -46,7 +46,7 @@ extern void SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ_isr(void);
#ifdef TFM_ENABLE_IRQ_TEST
void TFM_TIMER0_IRQ_Handler(void)
{
- priv_irq_handler_main(TFM_IRQ_TEST_1_ID,
+ priv_irq_handler_main(TFM_IRQ_TEST_1,
(uint32_t)SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ_isr,
SPM_CORE_IRQ_TEST_1_SIGNAL_TIMER_0_IRQ,
TFM_TIMER0_IRQ);
diff --git a/secure_fw/core/tfm_secure_irq_handlers.inc.template b/secure_fw/core/tfm_secure_irq_handlers.inc.template
index 8633756a08..872c4b0814 100644
--- a/secure_fw/core/tfm_secure_irq_handlers.inc.template
+++ b/secure_fw/core/tfm_secure_irq_handlers.inc.template
@@ -10,9 +10,9 @@
{% for header in utilities.manifest_header_list %}
#include "{{header}}"
{% endfor %}
-#include "secure_fw/services/tfm_partition_defs.inc"
+#include "psa_manifest/pid.h"
{% macro _irq_record(partition_name, signal, line, priority) -%}
-{ {{ partition_name }}_ID, {{ signal }}, {{ line }}, {{ priority }} },
+{ {{ partition_name }}, {{ signal }}, {{ line }}, {{ priority }} },
{%- endmacro %}
/* Definitions of the signals of the IRQs */
@@ -83,7 +83,7 @@ void {{handler.source}}_Handler(void)
{% endif %}
{
{% if handler.source %}
- priv_irq_handler_main({{manifest.manifest.name}}_ID,
+ priv_irq_handler_main({{manifest.manifest.name}},
(uint32_t){{handler.signal}}_isr,
{{handler.signal}},
{{handler.source}});
diff --git a/secure_fw/ns_callable/tfm_veneers.c b/secure_fw/ns_callable/tfm_veneers.c
index c40973d1bb..8f527e2ba3 100644
--- a/secure_fw/ns_callable/tfm_veneers.c
+++ b/secure_fw/ns_callable/tfm_veneers.c
@@ -133,7 +133,7 @@ psa_status_t spm_irq_test_1_execute_test_scenario(psa_invec *, size_t, psa_outve
psa_outvec *out_vec, \
size_t out_len) \
{ \
- TFM_CORE_IOVEC_SFN_REQUEST(partition_name##_ID, \
+ TFM_CORE_IOVEC_SFN_REQUEST(partition_name, \
(void *) sfn_name, \
in_vec, in_len, out_vec, out_len); \
}
diff --git a/secure_fw/ns_callable/tfm_veneers.c.template b/secure_fw/ns_callable/tfm_veneers.c.template
index 366d7983ef..9bfec9c2dd 100644
--- a/secure_fw/ns_callable/tfm_veneers.c.template
+++ b/secure_fw/ns_callable/tfm_veneers.c.template
@@ -31,7 +31,7 @@ psa_status_t {{sec_func.signal.lower()}}(psa_invec *, size_t, psa_outvec *, size
psa_outvec *out_vec, \
size_t out_len) \
{ \
- TFM_CORE_IOVEC_SFN_REQUEST(partition_name##_ID, \
+ TFM_CORE_IOVEC_SFN_REQUEST(partition_name, \
(void *) sfn_name, \
in_vec, in_len, out_vec, out_len); \
}
diff --git a/secure_fw/services/audit_logging/tfm_audit_logging.yaml b/secure_fw/services/audit_logging/tfm_audit_logging.yaml
index 144747cefd..23be56c16b 100644
--- a/secure_fw/services/audit_logging/tfm_audit_logging.yaml
+++ b/secure_fw/services/audit_logging/tfm_audit_logging.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_AUDIT_LOG",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000101",
"entry_point": "audit_core_init",
"stack_size": "0x0200",
"heap_size": "0",
diff --git a/secure_fw/services/crypto/tfm_crypto.yaml b/secure_fw/services/crypto/tfm_crypto.yaml
index ecfeb539ea..1fa3afc16b 100644
--- a/secure_fw/services/crypto/tfm_crypto.yaml
+++ b/secure_fw/services/crypto/tfm_crypto.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_CRYPTO",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000102",
"entry_point": "tfm_crypto_init",
"stack_size": "0x2000",
"heap_size": "0x0400",
diff --git a/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml b/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml
index 6ce4f6d217..c5d0cd2690 100644
--- a/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml
+++ b/secure_fw/services/initial_attestation/tfm_initial_attestation.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_INITIAL_ATTESTATION",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000103",
"entry_point": "attest_partition_init",
"stack_size": "0x0A00",
"heap_size": "0x0400",
diff --git a/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml b/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml
index da8225e148..64937f21fa 100644
--- a/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml
+++ b/secure_fw/services/internal_trusted_storage/tfm_internal_trusted_storage.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_ITS",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000104",
"entry_point": "tfm_its_req_mngr_init",
"stack_size": "0x500",
"heap_size": "0",
diff --git a/secure_fw/services/platform/tfm_platform.yaml b/secure_fw/services/platform/tfm_platform.yaml
index abea2726ff..0bacbbb6d7 100644
--- a/secure_fw/services/platform/tfm_platform.yaml
+++ b/secure_fw/services/platform/tfm_platform.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_PLATFORM",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000102",
"entry_point": "platform_sp_init",
"stack_size": "0x0400",
"heap_size": "0x0400",
diff --git a/secure_fw/services/secure_storage/tfm_secure_storage.yaml b/secure_fw/services/secure_storage/tfm_secure_storage.yaml
index 23b0d8991e..2d03998a35 100644
--- a/secure_fw/services/secure_storage/tfm_secure_storage.yaml
+++ b/secure_fw/services/secure_storage/tfm_secure_storage.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_STORAGE",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000100",
"entry_point": "tfm_sst_req_mngr_init",
"stack_size": "0xA00",
"heap_size": "0",
diff --git a/secure_fw/services/tfm_partition_defs.inc b/secure_fw/services/tfm_partition_defs.inc
deleted file mode 100644
index 8bd8fa489d..0000000000
--- a/secure_fw/services/tfm_partition_defs.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-/*********** WARNING: This is an auto-generated file. Do not edit! ***********/
-
-#ifndef __TFM_PARTITION_DEFS_INC__
-#define __TFM_PARTITION_DEFS_INC__
-
-#define TFM_SP_STORAGE_ID (TFM_SP_BASE + 0)
-
-#define TFM_SP_ITS_ID (TFM_SP_BASE + 1)
-
-#ifdef TFM_PARTITION_AUDIT_LOG
-#define TFM_SP_AUDIT_LOG_ID (TFM_SP_BASE + 2)
-#endif /* TFM_PARTITION_AUDIT_LOG */
-
-#define TFM_SP_CRYPTO_ID (TFM_SP_BASE + 3)
-
-#ifdef TFM_PARTITION_PLATFORM
-#define TFM_SP_PLATFORM_ID (TFM_SP_BASE + 4)
-#endif /* TFM_PARTITION_PLATFORM */
-
-#define TFM_SP_INITIAL_ATTESTATION_ID (TFM_SP_BASE + 5)
-
-#ifdef TFM_PARTITION_TEST_CORE
-#define TFM_SP_CORE_TEST_ID (TFM_SP_BASE + 6)
-#endif /* TFM_PARTITION_TEST_CORE */
-
-#ifdef TFM_PARTITION_TEST_CORE
-#define TFM_SP_CORE_TEST_2_ID (TFM_SP_BASE + 7)
-#endif /* TFM_PARTITION_TEST_CORE */
-
-#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
-#define TFM_SP_SECURE_TEST_PARTITION_ID (TFM_SP_BASE + 8)
-#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
-
-#ifdef TFM_PARTITION_TEST_CORE_IPC
-#define TFM_SP_IPC_SERVICE_TEST_ID (TFM_SP_BASE + 9)
-#endif /* TFM_PARTITION_TEST_CORE_IPC */
-
-#ifdef TFM_PARTITION_TEST_CORE_IPC
-#define TFM_SP_IPC_CLIENT_TEST_ID (TFM_SP_BASE + 10)
-#endif /* TFM_PARTITION_TEST_CORE_IPC */
-
-#ifdef TFM_ENABLE_IRQ_TEST
-#define TFM_IRQ_TEST_1_ID (TFM_SP_BASE + 11)
-#endif /* TFM_ENABLE_IRQ_TEST */
-
-#define TFM_MAX_USER_PARTITIONS (12)
-
-#endif /* __TFM_PARTITION_DEFS_INC__ */
diff --git a/secure_fw/services/tfm_partition_defs.inc.template b/secure_fw/services/tfm_partition_defs.inc.template
deleted file mode 100644
index 10fd6a3718..0000000000
--- a/secure_fw/services/tfm_partition_defs.inc.template
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-{{utilities.donotedit_warning}}
-
-#ifndef __TFM_PARTITION_DEFS_INC__
-#define __TFM_PARTITION_DEFS_INC__
-
-{% set ns = namespace(iterator_counter=0) %}
-{% for manifest in manifests %}
- {% if manifest.attr.conditional %}
-#ifdef {{manifest.attr.conditional}}
- {% endif %}
-#define {{manifest.manifest.name}}_ID (TFM_SP_BASE + {{ns.iterator_counter}})
- {% set ns.found = true %}
- {% set ns.iterator_counter = ns.iterator_counter + 1 %}
- {% if manifest.attr.conditional %}
-#endif /* {{manifest.attr.conditional}} */
- {% endif %}
-
-{% endfor %}
-#define TFM_MAX_USER_PARTITIONS ({{manifests | length()}})
-
-#endif /* __TFM_PARTITION_DEFS_INC__ */
diff --git a/secure_fw/services/tfm_service_list.inc b/secure_fw/services/tfm_service_list.inc
index 3ae22ae6af..964643d712 100644
--- a/secure_fw/services/tfm_service_list.inc
+++ b/secure_fw/services/tfm_service_list.inc
@@ -28,7 +28,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_STORAGE ********/
{
.name = "TFM_SST_SET",
- .partition_id = TFM_SP_STORAGE_ID,
+ .partition_id = TFM_SP_STORAGE,
.signal = TFM_SST_SET_SIG,
.sid = 0x00000060,
.non_secure_client = true,
@@ -37,7 +37,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_SST_GET",
- .partition_id = TFM_SP_STORAGE_ID,
+ .partition_id = TFM_SP_STORAGE,
.signal = TFM_SST_GET_SIG,
.sid = 0x00000061,
.non_secure_client = true,
@@ -46,7 +46,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_SST_GET_INFO",
- .partition_id = TFM_SP_STORAGE_ID,
+ .partition_id = TFM_SP_STORAGE,
.signal = TFM_SST_GET_INFO_SIG,
.sid = 0x00000062,
.non_secure_client = true,
@@ -55,7 +55,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_SST_REMOVE",
- .partition_id = TFM_SP_STORAGE_ID,
+ .partition_id = TFM_SP_STORAGE,
.signal = TFM_SST_REMOVE_SIG,
.sid = 0x00000063,
.non_secure_client = true,
@@ -64,7 +64,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_SST_GET_SUPPORT",
- .partition_id = TFM_SP_STORAGE_ID,
+ .partition_id = TFM_SP_STORAGE,
.signal = TFM_SST_GET_SUPPORT_SIG,
.sid = 0x00000064,
.non_secure_client = true,
@@ -75,7 +75,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_ITS ********/
{
.name = "TFM_ITS_SET",
- .partition_id = TFM_SP_ITS_ID,
+ .partition_id = TFM_SP_ITS,
.signal = TFM_ITS_SET_SIG,
.sid = 0x00000070,
.non_secure_client = true,
@@ -84,7 +84,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_ITS_GET",
- .partition_id = TFM_SP_ITS_ID,
+ .partition_id = TFM_SP_ITS,
.signal = TFM_ITS_GET_SIG,
.sid = 0x00000071,
.non_secure_client = true,
@@ -93,7 +93,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_ITS_GET_INFO",
- .partition_id = TFM_SP_ITS_ID,
+ .partition_id = TFM_SP_ITS,
.signal = TFM_ITS_GET_INFO_SIG,
.sid = 0x00000072,
.non_secure_client = true,
@@ -102,7 +102,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_ITS_REMOVE",
- .partition_id = TFM_SP_ITS_ID,
+ .partition_id = TFM_SP_ITS,
.signal = TFM_ITS_REMOVE_SIG,
.sid = 0x00000073,
.non_secure_client = true,
@@ -113,7 +113,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_CRYPTO ********/
{
.name = "TFM_CRYPTO",
- .partition_id = TFM_SP_CRYPTO_ID,
+ .partition_id = TFM_SP_CRYPTO,
.signal = TFM_CRYPTO_SIG,
.sid = 0x00000080,
.non_secure_client = true,
@@ -124,7 +124,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_INITIAL_ATTESTATION ********/
{
.name = "TFM_ATTEST_GET_TOKEN",
- .partition_id = TFM_SP_INITIAL_ATTESTATION_ID,
+ .partition_id = TFM_SP_INITIAL_ATTESTATION,
.signal = PSA_ATTEST_GET_TOKEN_SIG,
.sid = 0x00000020,
.non_secure_client = true,
@@ -133,7 +133,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "TFM_ATTEST_GET_TOKEN_SIZE",
- .partition_id = TFM_SP_INITIAL_ATTESTATION_ID,
+ .partition_id = TFM_SP_INITIAL_ATTESTATION,
.signal = PSA_ATTEST_GET_TOKEN_SIZE_SIG,
.sid = 0x00000021,
.non_secure_client = true,
@@ -145,7 +145,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_CORE_TEST ********/
{
.name = "SPM_CORE_TEST_INIT_SUCCESS",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_INIT_SUCCESS_SIGNAL,
.sid = 0x0000F020,
.non_secure_client = true,
@@ -154,7 +154,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_DIRECT_RECURSION",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_DIRECT_RECURSION_SIGNAL,
.sid = 0x0000F021,
.non_secure_client = true,
@@ -163,7 +163,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_MPU_ACCESS",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_MPU_ACCESS_SIGNAL,
.sid = 0x0000F022,
.non_secure_client = true,
@@ -172,7 +172,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_MEMORY_PERMISSIONS",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_MEMORY_PERMISSIONS_SIGNAL,
.sid = 0x0000F023,
.non_secure_client = true,
@@ -181,7 +181,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_SS_TO_SS",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_SS_TO_SS_SIGNAL,
.sid = 0x0000F024,
.non_secure_client = true,
@@ -190,7 +190,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_SS_TO_SS_BUFFER",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_SS_TO_SS_BUFFER_SIGNAL,
.sid = 0x0000F025,
.non_secure_client = true,
@@ -199,7 +199,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_OUTVEC_WRITE",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_OUTVEC_WRITE_SIGNAL,
.sid = 0x0000F026,
.non_secure_client = true,
@@ -208,7 +208,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_PERIPHERAL_ACCESS",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_PERIPHERAL_ACCESS_SIGNAL,
.sid = 0x0000F027,
.non_secure_client = true,
@@ -217,7 +217,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_GET_CALLER_CLIENT_ID",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SIGNAL,
.sid = 0x0000F028,
.non_secure_client = true,
@@ -226,7 +226,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_SPM_REQUEST",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_SPM_REQUEST_SIGNAL,
.sid = 0x0000F029,
.non_secure_client = true,
@@ -235,7 +235,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_BLOCK",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_BLOCK_SIGNAL,
.sid = 0x0000F02A,
.non_secure_client = true,
@@ -244,7 +244,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_NS_THREAD",
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.signal = SPM_CORE_TEST_NS_THREAD_SIGNAL,
.sid = 0x0000F02B,
.non_secure_client = true,
@@ -257,7 +257,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_CORE_TEST_2 ********/
{
.name = "SPM_CORE_TEST_2_SLAVE_SERVICE",
- .partition_id = TFM_SP_CORE_TEST_2_ID,
+ .partition_id = TFM_SP_CORE_TEST_2,
.signal = SPM_CORE_TEST_2_SLAVE_SERVICE_SIGNAL,
.sid = 0x0000F040,
.non_secure_client = true,
@@ -266,7 +266,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
- .partition_id = TFM_SP_CORE_TEST_2_ID,
+ .partition_id = TFM_SP_CORE_TEST_2,
.signal = SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SIGNAL,
.sid = 0x0000F041,
.non_secure_client = true,
@@ -275,7 +275,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
- .partition_id = TFM_SP_CORE_TEST_2_ID,
+ .partition_id = TFM_SP_CORE_TEST_2,
.signal = SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SIGNAL,
.sid = 0x0000F042,
.non_secure_client = true,
@@ -284,7 +284,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_2_INVERT",
- .partition_id = TFM_SP_CORE_TEST_2_ID,
+ .partition_id = TFM_SP_CORE_TEST_2,
.signal = SPM_CORE_TEST_2_INVERT_SIGNAL,
.sid = 0x0000F043,
.non_secure_client = true,
@@ -293,7 +293,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO",
- .partition_id = TFM_SP_CORE_TEST_2_ID,
+ .partition_id = TFM_SP_CORE_TEST_2,
.signal = SPM_CORE_TEST_2_PREPARE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F044,
.non_secure_client = true,
@@ -302,7 +302,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO",
- .partition_id = TFM_SP_CORE_TEST_2_ID,
+ .partition_id = TFM_SP_CORE_TEST_2,
.signal = SPM_CORE_TEST_2_EXECUTE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F045,
.non_secure_client = true,
@@ -315,7 +315,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_SECURE_TEST_PARTITION ********/
{
.name = "TFM_SECURE_CLIENT_SFN_RUN_TESTS",
- .partition_id = TFM_SP_SECURE_TEST_PARTITION_ID,
+ .partition_id = TFM_SP_SECURE_TEST_PARTITION,
.signal = TFM_SECURE_CLIENT_SFN_RUN_TESTS_SIG,
.sid = 0x0000F000,
.non_secure_client = true,
@@ -328,7 +328,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_IPC_SERVICE_TEST ********/
{
.name = "IPC_SERVICE_TEST_BASIC",
- .partition_id = TFM_SP_IPC_SERVICE_TEST_ID,
+ .partition_id = TFM_SP_IPC_SERVICE_TEST,
.signal = IPC_SERVICE_TEST_BASIC_SIGNAL,
.sid = 0x0000F080,
.non_secure_client = true,
@@ -337,7 +337,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM",
- .partition_id = TFM_SP_IPC_SERVICE_TEST_ID,
+ .partition_id = TFM_SP_IPC_SERVICE_TEST,
.signal = IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SIGNAL,
.sid = 0x0000F081,
.non_secure_client = true,
@@ -346,7 +346,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
- .partition_id = TFM_SP_IPC_SERVICE_TEST_ID,
+ .partition_id = TFM_SP_IPC_SERVICE_TEST,
.signal = IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL,
.sid = 0x0000F082,
.non_secure_client = true,
@@ -355,7 +355,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM",
- .partition_id = TFM_SP_IPC_SERVICE_TEST_ID,
+ .partition_id = TFM_SP_IPC_SERVICE_TEST,
.signal = IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SIGNAL,
.sid = 0x0000F083,
.non_secure_client = true,
@@ -368,7 +368,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_SP_IPC_CLIENT_TEST ********/
{
.name = "IPC_CLIENT_TEST_BASIC",
- .partition_id = TFM_SP_IPC_CLIENT_TEST_ID,
+ .partition_id = TFM_SP_IPC_CLIENT_TEST,
.signal = IPC_CLIENT_TEST_BASIC_SIGNAL,
.sid = 0x0000F060,
.non_secure_client = true,
@@ -377,7 +377,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM",
- .partition_id = TFM_SP_IPC_CLIENT_TEST_ID,
+ .partition_id = TFM_SP_IPC_CLIENT_TEST,
.signal = IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SIGNAL,
.sid = 0x0000F061,
.non_secure_client = true,
@@ -386,7 +386,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
- .partition_id = TFM_SP_IPC_CLIENT_TEST_ID,
+ .partition_id = TFM_SP_IPC_CLIENT_TEST,
.signal = IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL,
.sid = 0x0000F062,
.non_secure_client = true,
@@ -395,7 +395,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM",
- .partition_id = TFM_SP_IPC_CLIENT_TEST_ID,
+ .partition_id = TFM_SP_IPC_CLIENT_TEST,
.signal = IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SIGNAL,
.sid = 0x0000F063,
.non_secure_client = true,
@@ -404,7 +404,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "IPC_CLIENT_TEST_MEM_CHECK",
- .partition_id = TFM_SP_IPC_CLIENT_TEST_ID,
+ .partition_id = TFM_SP_IPC_CLIENT_TEST,
.signal = IPC_CLIENT_TEST_MEM_CHECK_SIGNAL,
.sid = 0x0000F064,
.non_secure_client = true,
@@ -417,7 +417,7 @@ const struct tfm_spm_service_db_t service_db[] =
/******** TFM_IRQ_TEST_1 ********/
{
.name = "SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO",
- .partition_id = TFM_IRQ_TEST_1_ID,
+ .partition_id = TFM_IRQ_TEST_1,
.signal = SPM_CORE_IRQ_TEST_1_PREPARE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F0A0,
.non_secure_client = true,
@@ -426,7 +426,7 @@ const struct tfm_spm_service_db_t service_db[] =
},
{
.name = "SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO",
- .partition_id = TFM_IRQ_TEST_1_ID,
+ .partition_id = TFM_IRQ_TEST_1,
.signal = SPM_CORE_IRQ_TEST_1_EXECUTE_TEST_SCENARIO_SIGNAL,
.sid = 0x0000F0A1,
.non_secure_client = true,
diff --git a/secure_fw/services/tfm_service_list.inc.template b/secure_fw/services/tfm_service_list.inc.template
index 4fe23483c8..256e3bb163 100644
--- a/secure_fw/services/tfm_service_list.inc.template
+++ b/secure_fw/services/tfm_service_list.inc.template
@@ -26,7 +26,7 @@ const struct tfm_spm_service_db_t service_db[] =
{% for service in manifest.manifest.services %}
{{'{'}}
.name = "{{service.name}}",
- .partition_id = {{manifest.manifest.name}}_ID,
+ .partition_id = {{manifest.manifest.name}},
{% if service.signal %}
.signal = {{service.signal}},
{% else %}
diff --git a/secure_fw/services/tfm_spm_db.inc b/secure_fw/services/tfm_spm_db.inc
index a4fe4f12ac..ec59c51366 100644
--- a/secure_fw/services/tfm_spm_db.inc
+++ b/secure_fw/services/tfm_spm_db.inc
@@ -109,152 +109,152 @@ extern int32_t tfm_irq_test_1_init(void);
REGION_DECLARE(Image$$, ARM_LIB_STACK, $$ZI$$Base);
REGION_DECLARE(Image$$, ARM_LIB_STACK, $$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_STORAGE, _STACK$$ZI$$Limit);
-
-REGION_DECLARE(Image$$, TFM_SP_ITS, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_ITS, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_ITS, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_ITS, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_ITS, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_ITS, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_ITS, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_ITS, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_ITS, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_ITS, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_STORAGE_LINKER, _STACK$$ZI$$Limit);
+
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_ITS_LINKER, _STACK$$ZI$$Limit);
#ifdef TFM_PARTITION_AUDIT_LOG
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_AUDIT_LOG_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_PARTITION_AUDIT_LOG */
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CRYPTO, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CRYPTO_LINKER, _STACK$$ZI$$Limit);
#ifdef TFM_PARTITION_PLATFORM
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_PLATFORM, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_PLATFORM_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_PARTITION_PLATFORM */
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_INITIAL_ATTESTATION_LINKER, _STACK$$ZI$$Limit);
#ifdef TFM_PARTITION_TEST_CORE
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_CORE_TEST_2_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_SECURE_TEST_PARTITION_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_SERVICE_TEST_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_PARTITION_TEST_CORE_IPC
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, $$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, $$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_SP_IPC_CLIENT_TEST_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, $$Base);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, $$Limit);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, $$RO$$Base);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, $$RO$$Limit);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, TFM_IRQ_TEST_1, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, $$Base);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, $$Limit);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, TFM_IRQ_TEST_1_LINKER, _STACK$$ZI$$Limit);
#endif /* TFM_ENABLE_IRQ_TEST */
#endif /* defined(TFM_PSA_API) */
@@ -448,7 +448,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_STORAGE_ID,
+ .partition_id = TFM_SP_STORAGE,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -460,7 +460,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_ITS_ID,
+ .partition_id = TFM_SP_ITS,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -473,7 +473,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_AUDIT_LOG_ID,
+ .partition_id = TFM_SP_AUDIT_LOG,
.partition_flags = 0
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -486,7 +486,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_CRYPTO_ID,
+ .partition_id = TFM_SP_CRYPTO,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -499,7 +499,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_PLATFORM_ID,
+ .partition_id = TFM_SP_PLATFORM,
.partition_flags = 0
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -512,7 +512,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_INITIAL_ATTESTATION_ID,
+ .partition_id = TFM_SP_INITIAL_ATTESTATION,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -525,7 +525,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_CORE_TEST_ID,
+ .partition_id = TFM_SP_CORE_TEST,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -539,7 +539,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_CORE_TEST_2_ID,
+ .partition_id = TFM_SP_CORE_TEST_2,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_APP_ROT
,
@@ -553,7 +553,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_SECURE_TEST_PARTITION_ID,
+ .partition_id = TFM_SP_SECURE_TEST_PARTITION,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -567,7 +567,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_IPC_SERVICE_TEST_ID,
+ .partition_id = TFM_SP_IPC_SERVICE_TEST,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_PSA_ROT | SPM_PART_FLAG_APP_ROT
,
@@ -581,7 +581,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_SP_IPC_CLIENT_TEST_ID,
+ .partition_id = TFM_SP_IPC_CLIENT_TEST,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_APP_ROT
,
@@ -595,7 +595,7 @@ const struct spm_partition_static_data_t static_data_list[] =
#ifdef TFM_PSA_API
.psa_framework_version = 0x0100,
#endif /* defined(TFM_PSA_API) */
- .partition_id = TFM_IRQ_TEST_1_ID,
+ .partition_id = TFM_IRQ_TEST_1,
.partition_flags = SPM_PART_FLAG_IPC
| SPM_PART_FLAG_APP_ROT
,
@@ -679,174 +679,174 @@ const struct tfm_spm_partition_memory_data_t memory_data_list[] =
.rw_start = PART_REGION_ADDR(ARM_LIB_STACK, $$ZI$$Base),
},
{
- .code_start = PART_REGION_ADDR(TFM_SP_STORAGE, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_STORAGE, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_STORAGE, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_STORAGE, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_STORAGE, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_STORAGE, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_STORAGE, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_STORAGE, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_STORAGE, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_STORAGE, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_STORAGE_LINKER, _STACK$$ZI$$Limit),
},
{
- .code_start = PART_REGION_ADDR(TFM_SP_ITS, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_ITS, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_ITS, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_ITS, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_ITS, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_ITS, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_ITS, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_ITS, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_ITS, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_ITS, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_ITS_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_ITS_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_ITS_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_ITS_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_ITS_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_ITS_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_ITS_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_ITS_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_ITS_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_ITS_LINKER, _STACK$$ZI$$Limit),
},
#ifdef TFM_PARTITION_AUDIT_LOG
{
- .code_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_AUDIT_LOG, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_AUDIT_LOG_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_PARTITION_AUDIT_LOG */
{
- .code_start = PART_REGION_ADDR(TFM_SP_CRYPTO, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_CRYPTO, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_CRYPTO, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_CRYPTO, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_CRYPTO, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_CRYPTO, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_CRYPTO, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_CRYPTO, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_CRYPTO, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_CRYPTO, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_CRYPTO_LINKER, _STACK$$ZI$$Limit),
},
#ifdef TFM_PARTITION_PLATFORM
{
- .code_start = PART_REGION_ADDR(TFM_SP_PLATFORM, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_PLATFORM, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_PLATFORM, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_PLATFORM, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_PLATFORM, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_PLATFORM, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_PLATFORM, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_PLATFORM, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_PLATFORM, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_PLATFORM, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_PLATFORM_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_PARTITION_PLATFORM */
{
- .code_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_INITIAL_ATTESTATION_LINKER, _STACK$$ZI$$Limit),
},
#ifdef TFM_PARTITION_TEST_CORE
{
- .code_start = PART_REGION_ADDR(TFM_SP_CORE_TEST, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_CORE_TEST, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_CORE_TEST, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_CORE_TEST, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_CORE_TEST, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_CORE_TEST, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_CORE_TEST_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_CORE
{
- .code_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_CORE_TEST_2, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_CORE_TEST_2_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_PARTITION_TEST_CORE */
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
{
- .code_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_SECURE_TEST_PARTITION_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_PARTITION_TEST_SECURE_SERVICES */
#ifdef TFM_PARTITION_TEST_CORE_IPC
{
- .code_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_IPC_SERVICE_TEST_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_PARTITION_TEST_CORE_IPC
{
- .code_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_SP_IPC_CLIENT_TEST_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_PARTITION_TEST_CORE_IPC */
#ifdef TFM_ENABLE_IRQ_TEST
{
- .code_start = PART_REGION_ADDR(TFM_IRQ_TEST_1, $$Base),
- .code_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1, $$Limit),
- .ro_start = PART_REGION_ADDR(TFM_IRQ_TEST_1, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR(TFM_IRQ_TEST_1, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR(TFM_IRQ_TEST_1, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR(TFM_IRQ_TEST_1, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR(TFM_IRQ_TEST_1, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR(TFM_IRQ_TEST_1_LINKER, _STACK$$ZI$$Limit),
},
#endif /* TFM_ENABLE_IRQ_TEST */
diff --git a/secure_fw/services/tfm_spm_db.inc.template b/secure_fw/services/tfm_spm_db.inc.template
index a11a00a048..b69fbe9692 100644
--- a/secure_fw/services/tfm_spm_db.inc.template
+++ b/secure_fw/services/tfm_spm_db.inc.template
@@ -57,16 +57,16 @@ REGION_DECLARE(Image$$, ARM_LIB_STACK, $$ZI$$Limit);
{% if manifest.attr.conditional %}
#ifdef {{manifest.attr.conditional}}
{% endif %}
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, $$Base);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, $$Limit);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, $$RO$$Base);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, $$RO$$Limit);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, _DATA$$RW$$Base);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, _DATA$$RW$$Limit);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, _DATA$$ZI$$Base);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, _DATA$$ZI$$Limit);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, _STACK$$ZI$$Base);
-REGION_DECLARE(Image$$, {{manifest.manifest.name}}, _STACK$$ZI$$Limit);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, $$Base);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, $$Limit);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, $$RO$$Base);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, $$RO$$Limit);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, _DATA$$RW$$Base);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, _DATA$$RW$$Limit);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, _DATA$$ZI$$Base);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, _DATA$$ZI$$Limit);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, _STACK$$ZI$$Base);
+REGION_DECLARE(Image$$, {{manifest.manifest.name}}_LINKER, _STACK$$ZI$$Limit);
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
{% endif %}
@@ -167,7 +167,7 @@ const struct spm_partition_static_data_t static_data_list[] =
.psa_framework_version = 0,
{% endif %}
#endif /* defined(TFM_PSA_API) */
- .partition_id = {{manifest.manifest.name}}_ID,
+ .partition_id = {{manifest.manifest.name}},
{% if manifest.attr.tfm_partition_ipc %}
.partition_flags = SPM_PART_FLAG_IPC
{% else %}
@@ -247,16 +247,16 @@ const struct tfm_spm_partition_memory_data_t memory_data_list[] =
#ifdef {{manifest.attr.conditional}}
{% endif %}
{{'{'}}
- .code_start = PART_REGION_ADDR({{manifest.manifest.name}}, $$Base),
- .code_limit = PART_REGION_ADDR({{manifest.manifest.name}}, $$Limit),
- .ro_start = PART_REGION_ADDR({{manifest.manifest.name}}, $$RO$$Base),
- .ro_limit = PART_REGION_ADDR({{manifest.manifest.name}}, $$RO$$Limit),
- .rw_start = PART_REGION_ADDR({{manifest.manifest.name}}, _DATA$$RW$$Base),
- .rw_limit = PART_REGION_ADDR({{manifest.manifest.name}}, _DATA$$RW$$Limit),
- .zi_start = PART_REGION_ADDR({{manifest.manifest.name}}, _DATA$$ZI$$Base),
- .zi_limit = PART_REGION_ADDR({{manifest.manifest.name}}, _DATA$$ZI$$Limit),
- .stack_bottom = PART_REGION_ADDR({{manifest.manifest.name}}, _STACK$$ZI$$Base),
- .stack_top = PART_REGION_ADDR({{manifest.manifest.name}}, _STACK$$ZI$$Limit),
+ .code_start = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, $$Base),
+ .code_limit = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, $$Limit),
+ .ro_start = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, $$RO$$Base),
+ .ro_limit = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, $$RO$$Limit),
+ .rw_start = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, _DATA$$RW$$Base),
+ .rw_limit = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, _DATA$$RW$$Limit),
+ .zi_start = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, _DATA$$ZI$$Base),
+ .zi_limit = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, _DATA$$ZI$$Limit),
+ .stack_bottom = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, _STACK$$ZI$$Base),
+ .stack_top = PART_REGION_ADDR({{manifest.manifest.name}}_LINKER, _STACK$$ZI$$Limit),
{{'},'}}
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
diff --git a/secure_fw/spm/spm_partition_defs.h b/secure_fw/spm/spm_partition_defs.h
index 85ab1eca6e..4e32bafec0 100644
--- a/secure_fw/spm/spm_partition_defs.h
+++ b/secure_fw/spm/spm_partition_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2019, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -29,7 +29,7 @@
*/
#define TFM_SP_CORE_ID (1)
-#include "secure_fw/services/tfm_partition_defs.inc"
+#include "psa_manifest/pid.h"
/* This limit is only used to define the size of the database reserved for
* partitions. There's no requirement that it match the number of partitions
diff --git a/test/test_services/tfm_core_test/tfm_test_core.yaml b/test/test_services/tfm_core_test/tfm_test_core.yaml
index cbf19ca7d0..d038986fac 100644
--- a/test/test_services/tfm_core_test/tfm_test_core.yaml
+++ b/test/test_services/tfm_core_test/tfm_test_core.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_CORE_TEST",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000002",
"entry_point": "core_test_init",
"stack_size": "0x0300",
"heap_size": "0",
diff --git a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
index 029bc6d412..b584b933be 100644
--- a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
+++ b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
@@ -73,18 +73,18 @@ psa_status_t spm_core_test_2_check_caller_client_id(struct psa_invec *in_vec,
/* test with valid output pointers */
ret = tfm_core_get_caller_client_id(&caller_client_id_zi);
- if (ret != TFM_SUCCESS || caller_client_id_zi != TFM_SP_CORE_TEST_ID) {
+ if (ret != TFM_SUCCESS || caller_client_id_zi != TFM_SP_CORE_TEST) {
return CORE_TEST_ERRNO_TEST_FAULT;
}
ret = tfm_core_get_caller_client_id(&caller_client_id_rw);
- if (ret != TFM_SUCCESS || caller_client_id_rw != TFM_SP_CORE_TEST_ID) {
+ if (ret != TFM_SUCCESS || caller_client_id_rw != TFM_SP_CORE_TEST) {
return CORE_TEST_ERRNO_TEST_FAULT;
}
ret = tfm_core_get_caller_client_id(&caller_client_id_stack);
if (ret != TFM_SUCCESS ||
- caller_client_id_stack != TFM_SP_CORE_TEST_ID) {
+ caller_client_id_stack != TFM_SP_CORE_TEST) {
return CORE_TEST_ERRNO_TEST_FAULT;
}
diff --git a/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml b/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml
index 61f1af5def..1b828eed52 100644
--- a/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml
+++ b/test/test_services/tfm_core_test_2/tfm_test_core_2.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_CORE_TEST_2",
"type": "APPLICATION-ROT",
"priority": "NORMAL",
- "id": "0x00000003",
"entry_point": "core_test_2_init",
"stack_size": "0x0200",
"heap_size": "0",
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 ecc8b652d1..6dc714d84a 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
@@ -10,7 +10,6 @@
"name": "TFM_SP_IPC_CLIENT_TEST",
"type": "APPLICATION-ROT",
"priority": "NORMAL",
- "id": "0x00000006",
"entry_point": "ipc_client_test_main",
"stack_size": "0x0220",
"heap_size": "0",
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 89b6536056..d237f798c8 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
@@ -10,7 +10,6 @@
"name": "TFM_SP_IPC_SERVICE_TEST",
"type": "PSA-ROT",
"priority": "HIGH",
- "id": "0x00000007",
"entry_point": "ipc_service_test_main",
"stack_size": "0x0220",
"heap_size": "0",
diff --git a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml
index 5e8531c230..d65ba4b8c7 100644
--- a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml
+++ b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.yaml
@@ -10,7 +10,6 @@
"name": "TFM_IRQ_TEST_1",
"type": "APPLICATION-ROT",
"priority": "NORMAL",
- "id": "0x0000010B",
"entry_point": "tfm_irq_test_1_init",
"stack_size": "0x0400",
"heap_size": "0x0400",
diff --git a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml
index f88280114f..2aab01efe0 100644
--- a/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml
+++ b/test/test_services/tfm_secure_client_service/tfm_test_client_service.yaml
@@ -10,7 +10,6 @@
"name": "TFM_SP_SECURE_TEST_PARTITION",
"type": "PSA-ROT",
"priority": "NORMAL",
- "id": "0x00000005",
"entry_point": "tfm_secure_client_service_init",
"stack_size": "0x0C00",
"heap_size": "0",
diff --git a/tools/tfm_generated_file_list.yaml b/tools/tfm_generated_file_list.yaml
index bef79e97a2..a71a835a63 100644
--- a/tools/tfm_generated_file_list.yaml
+++ b/tools/tfm_generated_file_list.yaml
@@ -12,11 +12,6 @@
"version_minor": 1,
"file_list": [
{
- "name": "Secure Partition ID definitions",
- "short_name": "tfm_partition_defs",
- "output": "secure_fw/services/tfm_partition_defs.inc"
- },
- {
"name": "Secure Partition declarations",
"short_name": "tfm_partition_list",
"output": "secure_fw/services/tfm_spm_db.inc"