diff options
| author | Manish Pandey <manish.pandey2@arm.com> | 2023-03-15 12:45:26 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-03-15 12:45:26 +0100 |
| commit | a4c69581aec798af796d6783b51d9a62648c8db9 (patch) | |
| tree | 3c122b0f34032709f4d15264ab0a479ed8b398ad /include/lib | |
| parent | 4c985e867469523f91588a2f76bbb5ee5ca53d05 (diff) | |
| parent | 42d4d3baacb3b11c68163ec85de1bf2e34e0c882 (diff) | |
| download | arm-trusted-firmware-a4c69581aec798af796d6783b51d9a62648c8db9.tar.gz | |
Merge "refactor(build): distinguish BL2 as TF-A entry point and BL2 running at EL3" into integration
Diffstat (limited to 'include/lib')
| -rw-r--r-- | include/lib/cpus/aarch32/cpu_macros.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/lib/cpus/aarch32/cpu_macros.S b/include/lib/cpus/aarch32/cpu_macros.S index 1f03f0992..ab2f2c62a 100644 --- a/include/lib/cpus/aarch32/cpu_macros.S +++ b/include/lib/cpus/aarch32/cpu_macros.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2023, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,7 +9,8 @@ #include <arch.h> #include <lib/cpus/errata_report.h> -#if defined(IMAGE_BL1) || defined(IMAGE_BL32) || (defined(IMAGE_BL2) && BL2_AT_EL3) +#if defined(IMAGE_BL1) || defined(IMAGE_BL32) \ + || (defined(IMAGE_BL2) && RESET_TO_BL2) #define IMAGE_AT_EL3 #endif |