diff options
author | Joanna Farley <joanna.farley@arm.com> | 2020-10-18 14:51:00 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-10-18 14:51:00 +0000 |
commit | 943aff0c16434d558d3e1f5744d6119b49970504 (patch) | |
tree | e58b88828fa7d1946361c9ef45f9f1128cf92c89 /bl32 | |
parent | 4a6b33ec17702dfa23d8380e8e55b7f49f49dc7a (diff) | |
parent | d7b5f40823d449cc79e6440174390997cf11a9d9 (diff) |
Merge "Increase type widths to satisfy width requirements" into integration
Diffstat (limited to 'bl32')
-rw-r--r-- | bl32/tsp/aarch64/tsp_entrypoint.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bl32/tsp/aarch64/tsp_entrypoint.S b/bl32/tsp/aarch64/tsp_entrypoint.S index ebc5c2c3d..a007bab30 100644 --- a/bl32/tsp/aarch64/tsp_entrypoint.S +++ b/bl32/tsp/aarch64/tsp_entrypoint.S @@ -60,7 +60,7 @@ func tsp_entrypoint _align=3 */ pie_fixup: ldr x0, =pie_fixup - and x0, x0, #~(PAGE_SIZE - 1) + and x0, x0, #~(PAGE_SIZE_MASK) mov_imm x1, (BL32_LIMIT - BL32_BASE) add x1, x1, x0 bl fixup_gdt_reloc |