diff options
-rw-r--r-- | include/runtime_services/ffa_endpoints.h | 23 | ||||
-rw-r--r-- | spm/cactus/cactus_def.h | 8 | ||||
-rw-r--r-- | spm/cactus/cactus_ffa_tests.c | 1 | ||||
-rw-r--r-- | tftf/tests/runtime_services/secure_service/ffa_helpers.c | 6 |
4 files changed, 25 insertions, 13 deletions
diff --git a/include/runtime_services/ffa_endpoints.h b/include/runtime_services/ffa_endpoints.h new file mode 100644 index 000000000..8d108edcd --- /dev/null +++ b/include/runtime_services/ffa_endpoints.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2020, Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef FFA_ENDPOINTS_H +#define FFA_ENDPOINTS_H + +/* UUID of cactus SPs as defined in the respective manifests. */ +#define PRIMARY_UUID {0xb4b5671e, 0x4a904fe1, 0xb81ffb13, 0xdae1dacb} +#define SECONDARY_UUID {0xd1582309, 0xf02347b9, 0x827c4464, 0xf5578fc8} +#define TERTIARY_UUID {0x79b55c73, 0x1d8c44b9, 0x859361e1, 0x770ad8d2} + +/* UUID of OPTEE SP as defined in the respective manifest. */ +#define OPTEE_UUID {0x486178e0, 0xe7f811e3, 0xbc5e0002, 0xa5d5c51b} + +#define OPTEE_FFA_GET_API_VERSION (0) +#define OPTEE_FFA_GET_OS_VERSION (1) +#define OPTEE_FFA_GET_OS_VERSION_MAJOR (3) +#define OPTEE_FFA_GET_OS_VERSION_MINOR (8) + +#endif diff --git a/spm/cactus/cactus_def.h b/spm/cactus/cactus_def.h index 83be35f7b..190f06315 100644 --- a/spm/cactus/cactus_def.h +++ b/spm/cactus/cactus_def.h @@ -36,12 +36,4 @@ #define get_sp_tx_start(sp_id) (CACTUS_TX_BASE + (((sp_id & 0x7FFFU) - 1U) * CACTUS_RX_TX_SIZE)) #define get_sp_tx_end(sp_id) (CACTUS_TX_BASE + (((sp_id & 0x7FFFU) - 1U) * CACTUS_RX_TX_SIZE) + PAGE_SIZE) -/* - * UUID of secure partition as defined in the respective manifests. - */ -#define PRIMARY_UUID {0xb4b5671e, 0x4a904fe1, 0xb81ffb13, 0xdae1dacb} -#define SECONDARY_UUID {0xd1582309, 0xf02347b9, 0x827c4464, 0xf5578fc8} -#define TERTIARY_UUID {0x79b55c73, 0x1d8c44b9, 0x859361e1, 0x770ad8d2} - - #endif /* CACTUS_DEF_H */ diff --git a/spm/cactus/cactus_ffa_tests.c b/spm/cactus/cactus_ffa_tests.c index 1b12fb7cf..a49d6657d 100644 --- a/spm/cactus/cactus_ffa_tests.c +++ b/spm/cactus/cactus_ffa_tests.c @@ -8,6 +8,7 @@ #include <errno.h> #include <cactus_platform_def.h> #include <cactus_def.h> +#include <ffa_endpoints.h> #include <ffa_helpers.h> #include <sp_helpers.h> diff --git a/tftf/tests/runtime_services/secure_service/ffa_helpers.c b/tftf/tests/runtime_services/secure_service/ffa_helpers.c index 78dfa422d..8ee4ebc76 100644 --- a/tftf/tests/runtime_services/secure_service/ffa_helpers.c +++ b/tftf/tests/runtime_services/secure_service/ffa_helpers.c @@ -6,14 +6,10 @@ #include <debug.h> #include <smccc.h> +#include <ffa_endpoints.h> #include <ffa_helpers.h> #include <ffa_svc.h> -#define OPTEE_FFA_GET_API_VERSION (0) -#define OPTEE_FFA_GET_OS_VERSION (1) -#define OPTEE_FFA_GET_OS_VERSION_MAJOR (3) -#define OPTEE_FFA_GET_OS_VERSION_MINOR (8) - /*----------------------------------------------------------------------------- * FFA_RUN * |