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 /bl1 | |
| parent | 4a6b33ec17702dfa23d8380e8e55b7f49f49dc7a (diff) | |
| parent | d7b5f40823d449cc79e6440174390997cf11a9d9 (diff) | |
| download | platform_external_arm-trusted-firmware-943aff0c16434d558d3e1f5744d6119b49970504.tar.gz platform_external_arm-trusted-firmware-943aff0c16434d558d3e1f5744d6119b49970504.tar.bz2 platform_external_arm-trusted-firmware-943aff0c16434d558d3e1f5744d6119b49970504.zip | |
Merge "Increase type widths to satisfy width requirements" into integration
Diffstat (limited to 'bl1')
| -rw-r--r-- | bl1/aarch64/bl1_context_mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bl1/aarch64/bl1_context_mgmt.c b/bl1/aarch64/bl1_context_mgmt.c index 87e367ce8..2a8d58efd 100644 --- a/bl1/aarch64/bl1_context_mgmt.c +++ b/bl1/aarch64/bl1_context_mgmt.c @@ -78,8 +78,8 @@ void bl1_prepare_next_image(unsigned int image_id) mode = MODE_EL2; } - next_bl_ep->spsr = (uint32_t)SPSR_64(mode, MODE_SP_ELX, - DISABLE_ALL_EXCEPTIONS); + next_bl_ep->spsr = (uint32_t)SPSR_64((uint64_t) mode, + (uint64_t)MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS); /* Allow platform to make change */ bl1_plat_set_ep_info(image_id, next_bl_ep); |