diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2019-08-02 10:21:53 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-08-02 10:21:53 +0000 |
| commit | a3b16996ecb5d1cedc997204612e5f7c36ccd576 (patch) | |
| tree | bf3de0c17a38822188847b7bdaad7f70441637b0 /lib/optee/optee_utils.c | |
| parent | 01c44dddbda2bf74dff4bdbaee43177236982887 (diff) | |
| parent | 402b3cf8766fe2cb4ae462f7ee7761d08a1ba56c (diff) | |
Merge "Switch AARCH32/AARCH64 to __aarch64__" into integration
Diffstat (limited to 'lib/optee/optee_utils.c')
| -rw-r--r-- | lib/optee/optee_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/optee/optee_utils.c b/lib/optee/optee_utils.c index f7392fda..2a407939 100644 --- a/lib/optee/optee_utils.c +++ b/lib/optee/optee_utils.c @@ -176,7 +176,7 @@ int parse_optee_header(entry_point_info_t *header_ep, */ if (!tee_validate_header(header)) { INFO("Invalid OPTEE header, set legacy mode.\n"); -#ifdef AARCH64 +#ifdef __aarch64__ header_ep->args.arg0 = MODE_RW_64; #else header_ep->args.arg0 = MODE_RW_32; @@ -222,7 +222,7 @@ int parse_optee_header(entry_point_info_t *header_ep, if (header->arch == 0) { header_ep->args.arg0 = MODE_RW_32; } else { -#ifdef AARCH64 +#ifdef __aarch64__ header_ep->args.arg0 = MODE_RW_64; #else ERROR("Cannot boot an AArch64 OP-TEE\n"); |