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 /include/common | |
| parent | 0caaa03bf182429e40d8785e4a9017c443841a52 (diff) | |
| parent | 76d267334626312adf48c8aad52a0f4178e64d61 (diff) | |
| download | platform_external_arm-trusted-firmware-0d3a27e7f6ee3fa1be4c705927bcf9cad3750809.tar.gz platform_external_arm-trusted-firmware-0d3a27e7f6ee3fa1be4c705927bcf9cad3750809.tar.bz2 platform_external_arm-trusted-firmware-0d3a27e7f6ee3fa1be4c705927bcf9cad3750809.zip | |
Merge pull request #1200 from robertovargas-arm/bl2-el3
Add BL2_AT_EL3 build option
Diffstat (limited to 'include/common')
| -rw-r--r-- | include/common/aarch32/el3_common_macros.S | 6 | ||||
| -rw-r--r-- | include/common/aarch64/el3_common_macros.S | 4 | ||||
| -rw-r--r-- | include/common/asm_macros_common.S | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/common/aarch32/el3_common_macros.S b/include/common/aarch32/el3_common_macros.S index 59e99f89a..d654b6523 100644 --- a/include/common/aarch32/el3_common_macros.S +++ b/include/common/aarch32/el3_common_macros.S @@ -260,9 +260,9 @@ * --------------------------------------------------------------------- */ .if \_init_c_runtime -#ifdef IMAGE_BL32 +#if defined(IMAGE_BL32) || (defined(IMAGE_BL2) && BL2_AT_EL3) /* ----------------------------------------------------------------- - * Invalidate the RW memory used by the BL32 (SP_MIN) image. This + * Invalidate the RW memory used by the image. This * includes the data and NOBITS sections. This is done to * safeguard against possible corruption of this memory by * dirty cache lines in a system cache as a result of use by @@ -273,7 +273,7 @@ ldr r1, =__RW_END__ sub r1, r1, r0 bl inv_dcache_range -#endif /* IMAGE_BL32 */ +#endif ldr r0, =__BSS_START__ ldr r1, =__BSS_SIZE__ diff --git a/include/common/aarch64/el3_common_macros.S b/include/common/aarch64/el3_common_macros.S index defd4a24e..4ebf77bbf 100644 --- a/include/common/aarch64/el3_common_macros.S +++ b/include/common/aarch64/el3_common_macros.S @@ -269,7 +269,7 @@ * --------------------------------------------------------------------- */ .if \_init_c_runtime -#ifdef IMAGE_BL31 +#if defined(IMAGE_BL31) || (defined(IMAGE_BL2) && BL2_AT_EL3) /* ------------------------------------------------------------- * Invalidate the RW memory used by the BL31 image. This * includes the data and NOBITS sections. This is done to @@ -282,7 +282,7 @@ adr x1, __RW_END__ sub x1, x1, x0 bl inv_dcache_range -#endif /* IMAGE_BL31 */ +#endif ldr x0, =__BSS_START__ ldr x1, =__BSS_SIZE__ diff --git a/include/common/asm_macros_common.S b/include/common/asm_macros_common.S index 6a02e18ee..ca8c1ad0f 100644 --- a/include/common/asm_macros_common.S +++ b/include/common/asm_macros_common.S @@ -29,7 +29,7 @@ * debugging experience. */ .cfi_sections .debug_frame - .section .text.\_name, "ax" + .section .text.asm.\_name, "ax" .type \_name, %function .func \_name /* |