diff options
author | Kevin Peng <kevin.peng@arm.com> | 2021-07-14 11:40:23 +0800 |
---|---|---|
committer | Anton Komlev <Anton.Komlev@arm.com> | 2021-07-16 11:45:13 +0200 |
commit | 47a6374116a631f6585301f544486520a7a72e2c (patch) | |
tree | e38fc8f8fbee5da55118198192714b03815b89f5 /platform/ext/target | |
parent | 3880066b9212edd5b2bac06f73a1ea2585713183 (diff) | |
download | trusted-firmware-m-47a6374116a631f6585301f544486520a7a72e2c.tar.gz |
Platform: Add a customized manifest list for Musca-B1
When the Secure Enclave is enabled, the host core does not provide
PSA RoT Services and Protected Storage services. Instead a Proxy
Partition is provided to forward service requests to the SE.
The manifest list does not need to include those Partitions. Having
those Partitions causes potential conflicts with the Proxy Partition
because they provide same services and use the same manifest items.
This patch adds a customized manifest list for Musca-B1 with Secure
Encalve and removes the Proxy Partition in the common manifest list.
Change-Id: Ib83ee415b7b3fc8a53eb59e2de42964f8c5fe326
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Diffstat (limited to 'platform/ext/target')
-rw-r--r-- | platform/ext/target/arm/musca_b1/sse_200/config.cmake | 4 | ||||
-rw-r--r-- | platform/ext/target/arm/musca_b1/sse_200/manifest_list_with_se.yaml | 206 |
2 files changed, 209 insertions, 1 deletions
diff --git a/platform/ext/target/arm/musca_b1/sse_200/config.cmake b/platform/ext/target/arm/musca_b1/sse_200/config.cmake index 236708500e..15dc3005d8 100644 --- a/platform/ext/target/arm/musca_b1/sse_200/config.cmake +++ b/platform/ext/target/arm/musca_b1/sse_200/config.cmake @@ -37,9 +37,11 @@ else() set(CRYPTO_HW_ACCELERATOR OFF CACHE BOOL "Whether to enable the crypto hardware accelerator on supported platforms") set(PS_TEST_NV_COUNTERS OFF CACHE BOOL "Use the test NV counters to test Protected Storage rollback scenarios") set(BL0 ON) + + set(TFM_MANIFEST_LIST ${CMAKE_SOURCE_DIR}/platform/ext/target/${TFM_PLATFORM}/manifest_list_with_se.yaml CACHE FILEPATH "Manifest Lists") endif() -set(TFM_EXTRA_GENERATED_FILE_LIST_PATH ${CMAKE_CURRENT_SOURCE_DIR}/platform/ext/target/arm/musca_b1/generated_file_list.yaml CACHE PATH "Path to extra generated file list. Appended to stardard TFM generated file list." FORCE) +set(TFM_EXTRA_GENERATED_FILE_LIST_PATH ${CMAKE_SOURCE_DIR}/platform/ext/target/arm/musca_b1/generated_file_list.yaml CACHE PATH "Path to extra generated file list. Appended to stardard TFM generated file list." FORCE) set(PSA_API_TEST_TARGET "musca_b1" CACHE STRING "Target to use when building the PSA API tests") diff --git a/platform/ext/target/arm/musca_b1/sse_200/manifest_list_with_se.yaml b/platform/ext/target/arm/musca_b1/sse_200/manifest_list_with_se.yaml new file mode 100644 index 0000000000..b14a0f2c32 --- /dev/null +++ b/platform/ext/target/arm/musca_b1/sse_200/manifest_list_with_se.yaml @@ -0,0 +1,206 @@ +#------------------------------------------------------------------------------- +# Copyright (c) 2021, Arm Limited. All rights reserved. +# +# SPDX-License-Identifier: BSD-3-Clause +# +#------------------------------------------------------------------------------- + +{ + "name": "Partition list for Musca-B1 SSE-200 in Dual core mode", + "type": "manifest_list", + "version_major": 0, + "version_minor": 1, + "manifest_list": [ + { + "name": "TFM Core Test Service", + "short_name": "TFM_SP_CORE_TEST", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_core_test/tfm_ss_core_test.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_PARTITION_TEST_CORE", + "version_major": 0, + "version_minor": 1, + "pid": 262, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_core_test.*" + ] + } + }, + { + "name": "TFM Core Test Service 2", + "short_name": "TFM_SP_CORE_TEST_2", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_core_test_2/tfm_ss_core_test_2.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_PARTITION_TEST_CORE", + "version_major": 0, + "version_minor": 1, + "pid": 263, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_core_test_2.*" + ] + } + }, + { + "name": "TFM Secure Client Service", + "short_name": "TFM_SP_SECURE_TEST_PARTITION", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_secure_client_service/tfm_secure_client_service.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_PARTITION_TEST_SECURE_SERVICES", + "version_major": 0, + "version_minor": 1, + "pid": 264, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_secure_client_service.*" + ] + } + }, + { + "name": "TFM IPC Service Test", + "short_name": "TFM_SP_IPC_SERVICE_TEST", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_ipc_service/tfm_ipc_service_test.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_PARTITION_TEST_CORE_IPC", + "version_major": 0, + "version_minor": 1, + "pid": 265, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_ipc_service.*" + ] + } + }, + { + "name": "TFM IPC Client Service", + "short_name": "TFM_SP_IPC_CLIENT_TEST", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_ipc_client/tfm_ipc_client_test.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_PARTITION_TEST_CORE_IPC", + "version_major": 0, + "version_minor": 1, + "pid": 266, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_ipc_client.*" + ] + } + }, + { + "name": "TF-M PS Test Service", + "short_name": "TFM_SP_PS_TEST", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_ps_test_service/tfm_ps_test_service.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_PARTITION_TEST_PS", + "version_major": 0, + "version_minor": 1, + "pid": 268, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_ps_test.*" + ] + } + }, + { + "name": "TF-M Secure Client 2 Service", + "short_name": "TFM_SP_SECURE_CLIENT_2", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_secure_client_2/tfm_secure_client_2.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_PARTITION_TEST_SECURE_SERVICES", + "version_major": 0, + "version_minor": 1, + "pid": 269, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_secure_client_2.*" + ] + } + }, + { + "name": "TF-M PSA Proxy Service", + "short_name": "TFM_SP_PSA_PROXY", + "manifest": "secure_fw/partitions/psa_proxy/tfm_psa_proxy.yaml", + "tfm_extensions": true, + "conditional": "TFM_PARTITION_PSA_PROXY", + "version_major": 0, + "version_minor": 1, + "pid": 270, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_psa_proxy.*" + ] + } + }, + { + "name": "TFM Firmware Update Service", + "short_name": "TFM_SP_FWU", + "manifest": "secure_fw/partitions/firmware_update/tfm_firmware_update.yaml", + "conditional": "TFM_PARTITION_FIRMWARE_UPDATE", + "version_major": 0, + "version_minor": 1, + "pid": 271, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_fwu*" + ] + } + }, + { + "name": "TFM FFM11 Partition Service", + "short_name": "TFM_SP_FFM11", + "manifest": "secure_fw/partitions/tfm_ffm11_partition/tfm_ffm11_partition.yaml", + "conditional": "TFM_PARTITION_FFM11", + "version_major": 0, + "version_minor": 1, + "pid": 272, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_ffm11.*" + ] + } + }, + { + "name": "TFM Initial Attestation Test Service", + "short_name": "TFM_ATTEST_TEST_SERVICE", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_attest_test_service/tfm_attest_test_service.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "ATTEST_TEST_GET_PUBLIC_KEY", + "version_major": 0, + "version_minor": 1, + "pid": 273, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_attest_test_service.*" + ] + } + }, + { + "name": "TFM SLIH Test Service", + "short_name": "TFM_SP_SLIH_TEST", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_slih_test_service/tfm_slih_test_service.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_ENABLE_SLIH_TEST", + "version_major": 0, + "version_minor": 1, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_slih_test.*" + ] + } + }, + { + "name": "TFM FLIH Test Service", + "short_name": "TFM_SP_FLIH_TEST", + "manifest": "${TFM_TEST_PATH}/test_services/tfm_flih_test_service/tfm_flih_test_service.yaml", + "source_path": "${TFM_TEST_PATH}", + "conditional": "TFM_ENABLE_FLIH_TEST", + "version_major": 0, + "version_minor": 1, + "linker_pattern": { + "library_list": [ + "*tfm_*partition_flih_test.*" + ] + } + } + ] +} |