diff options
| author | Joanna Farley <joanna.farley@arm.com> | 2023-02-03 00:42:17 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-02-03 00:42:17 +0100 |
| commit | 8b47f87a5fa0f5de81a7a361f029fe4b10871f08 (patch) | |
| tree | 33b97504e48990de2d600d445df076a3c2b9e8a1 /lib | |
| parent | 1548e0e7b9146b5f68346a03c2dc5e88608e8044 (diff) | |
| parent | 05c69cf75edf53478e23fce157fea72372b49597 (diff) | |
| download | arm-trusted-firmware-8b47f87a5fa0f5de81a7a361f029fe4b10871f08.tar.gz | |
Merge "feat(optee): add loading OP-TEE image via an SMC" into integration
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/optee/optee_utils.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/lib/optee/optee_utils.c b/lib/optee/optee_utils.c index 6c87b0d07..25272fc94 100644 --- a/lib/optee/optee_utils.c +++ b/lib/optee/optee_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2023, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -11,42 +11,6 @@ #include <platform_def.h> -/* - * load_addr_hi and load_addr_lo: image load address. - * image_id: 0 - pager, 1 - paged - * size: image size in bytes. - */ -typedef struct optee_image { - uint32_t load_addr_hi; - uint32_t load_addr_lo; - uint32_t image_id; - uint32_t size; -} optee_image_t; - -#define OPTEE_PAGER_IMAGE_ID 0 -#define OPTEE_PAGED_IMAGE_ID 1 - -#define OPTEE_MAX_NUM_IMAGES 2u - -#define TEE_MAGIC_NUM_OPTEE 0x4554504f -/* - * magic: header magic number. - * version: OPTEE header version: - * 1 - not supported - * 2 - supported - * arch: OPTEE os architecture type: 0 - AARCH32, 1 - AARCH64. - * flags: unused currently. - * nb_images: number of images. - */ -typedef struct optee_header { - uint32_t magic; - uint8_t version; - uint8_t arch; - uint16_t flags; - uint32_t nb_images; - optee_image_t optee_image_list[]; -} optee_header_t; - /******************************************************************************* * Check if it is a valid tee header * Return true if valid |