diff options
author | davidcunado-arm <david.cunado@arm.com> | 2018-01-19 13:40:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-19 13:40:12 +0000 |
commit | 0d3a27e7f6ee3fa1be4c705927bcf9cad3750809 (patch) | |
tree | 6ff8104078387889e039eb2e7a0e9cf87fac4691 /lib/cpus/aarch64/cpu_helpers.S | |
parent | 0caaa03bf182429e40d8785e4a9017c443841a52 (diff) | |
parent | 76d267334626312adf48c8aad52a0f4178e64d61 (diff) |
Merge pull request #1200 from robertovargas-arm/bl2-el3
Add BL2_AT_EL3 build option
Diffstat (limited to 'lib/cpus/aarch64/cpu_helpers.S')
-rw-r--r-- | lib/cpus/aarch64/cpu_helpers.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/cpus/aarch64/cpu_helpers.S b/lib/cpus/aarch64/cpu_helpers.S index 23845534..ae1c3c25 100644 --- a/lib/cpus/aarch64/cpu_helpers.S +++ b/lib/cpus/aarch64/cpu_helpers.S @@ -7,7 +7,7 @@ #include <arch.h> #include <asm_macros.S> #include <assert_macros.S> -#ifdef IMAGE_BL31 +#if defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3) #include <cpu_data.h> #endif #include <cpu_macros.S> @@ -15,7 +15,7 @@ #include <errata_report.h> /* Reset fn is needed in BL at reset vector */ -#if defined(IMAGE_BL1) || defined(IMAGE_BL31) +#if defined(IMAGE_BL1) || defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3) /* * The reset handler common to all platforms. After a matching * cpu_ops structure entry is found, the correponding reset_handler @@ -47,7 +47,7 @@ func reset_handler ret endfunc reset_handler -#endif /* IMAGE_BL1 || IMAGE_BL31 */ +#endif #ifdef IMAGE_BL31 /* The power down core and cluster is needed only in BL31 */ /* |