aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRaef Coles <raef.coles@arm.com>2021-01-07 12:52:47 +0000
committerRaef Coles <raef.coles@arm.com>2021-01-19 10:07:52 +0000
commitdfe519bc8e2e7eaa692583a1c73a962cb1841c6e (patch)
tree8643f10adccaefdcff6195cb3c72fa6e716e9c0a /tools
parentd45060aa47cefc047d8c68a7308d3fb0d93961dd (diff)
downloadtrusted-firmware-m-dfe519bc8e2e7eaa692583a1c73a962cb1841c6e.tar.gz
Build: add rot to cmake partition target names
change from tfm_partition_x to tfm_app_rot_partition_x or tfm_psa_rot_partition_x. This allows the linker to automtically pick up the library files and determine where they should be placed. Update TFM_TEST_REPO_VERSION to point to f1e9130c47f213a5380b00427770f61486b6e4fe, which is the head of the changes required for enabling this patch to work. Change-Id: If0b355f9e94a0ecc862c292302a573df1b3f9c2d Signed-off-by: Raef Coles <raef.coles@arm.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/tfm_manifest_list.yaml55
1 files changed, 24 insertions, 31 deletions
diff --git a/tools/tfm_manifest_list.yaml b/tools/tfm_manifest_list.yaml
index 9962ffe59..0966eb9cb 100644
--- a/tools/tfm_manifest_list.yaml
+++ b/tools/tfm_manifest_list.yaml
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2018-2020, Arm Limited. All rights reserved.
+# Copyright (c) 2018-2021, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -22,11 +22,8 @@
"pid": 256,
"linker_pattern": {
"library_list": [
- "*tfm_partition_ps.*"
+ "*tfm_*partition_ps.*"
],
- "object_list": [
- "*test_ps_nv_counters.*",
- ]
}
},
{
@@ -40,7 +37,7 @@
"pid": 257,
"linker_pattern": {
"library_list": [
- "*tfm_partition_its.*"
+ "*tfm_*partition_its.*"
]
}
},
@@ -55,7 +52,7 @@
"pid": 258,
"linker_pattern": {
"library_list": [
- "*tfm_partition_audit.*"
+ "*tfm_*partition_audit.*"
]
}
},
@@ -70,7 +67,7 @@
"pid": 259,
"linker_pattern": {
"library_list": [
- "*tfm_partition_crypto.*"
+ "*tfm_*partition_crypto.*"
]
}
},
@@ -85,7 +82,7 @@
"pid": 260,
"linker_pattern": {
"library_list": [
- "*tfm_partition_platform.*"
+ "*tfm_*partition_platform.*"
]
}
},
@@ -100,7 +97,7 @@
"pid": 261,
"linker_pattern": {
"library_list": [
- "*tfm_partition_attestation.*"
+ "*tfm_*partition_attestation.*"
]
}
},
@@ -115,8 +112,8 @@
"version_minor": 1,
"pid": 262,
"linker_pattern": {
- "object_list": [
- "*tfm_ss_core_test.*"
+ "library_list": [
+ "*tfm_*partition_core_test.*"
]
}
},
@@ -131,8 +128,8 @@
"version_minor": 1,
"pid": 263,
"linker_pattern": {
- "object_list": [
- "*tfm_ss_core_test_2.*"
+ "library_list": [
+ "*tfm_*partition_core_test_2.*"
]
}
},
@@ -147,11 +144,8 @@
"version_minor": 1,
"pid": 264,
"linker_pattern": {
- "object_list": [
- "*tfm_secure_client_service.*",
- "*test_framework*",
- "*secure_suites.*",
- "*attestation_s_interface_testsuite.*"
+ "library_list": [
+ "*tfm_*partition_secure_client_service.*"
]
}
},
@@ -166,8 +160,8 @@
"version_minor": 1,
"pid": 265,
"linker_pattern": {
- "object_list": [
- "*tfm_ipc_service_test.*"
+ "library_list": [
+ "*tfm_*partition_ipc_service.*"
]
}
},
@@ -182,8 +176,8 @@
"version_minor": 1,
"pid": 266,
"linker_pattern": {
- "object_list": [
- "*tfm_ipc_client_test.*"
+ "library_list": [
+ "*tfm_*partition_ipc_client.*"
]
}
},
@@ -198,9 +192,8 @@
"version_minor": 1,
"pid": 267,
"linker_pattern": {
- "object_list": [
- "*tfm_irq_test_service_1.*",
- "*timer_cmsdk*",
+ "library_list": [
+ "*tfm_*partition_irq_test_1.*"
]
}
},
@@ -215,8 +208,8 @@
"version_minor": 1,
"pid": 268,
"linker_pattern": {
- "object_list": [
- "*tfm_ps_test_service.*"
+ "library_list": [
+ "*tfm_*partition_ps_test.*"
]
}
},
@@ -231,8 +224,8 @@
"version_minor": 1,
"pid": 269,
"linker_pattern": {
- "object_list": [
- "*tfm_secure_client_2.*"
+ "library_list": [
+ "*tfm_*partition_secure_client_2.*"
]
}
},
@@ -248,7 +241,7 @@
"pid": 270,
"linker_pattern": {
"library_list": [
- "*tfm_psa_proxy*"
+ "*tfm_*partition_psa_proxy.*"
]
}
}