aboutsummaryrefslogtreecommitdiff
path: root/bl2/bl2_main.c
diff options
context:
space:
mode:
authorVikram Kanigiri <vikram.kanigiri@arm.com>2014-05-13 14:42:08 +0100
committerVikram Kanigiri <vikram.kanigiri@arm.com>2014-05-22 15:42:09 +0100
commit23ff9baa7e01eac3a451f2e8ed768c9b90d3567a (patch)
tree93feb21b2f81d70f93e5e852cecbddb6fb1ba329 /bl2/bl2_main.c
parentec786cbca93651b06431e1933abb909626949644 (diff)
downloadarm-trusted-firmware-23ff9baa7e01eac3a451f2e8ed768c9b90d3567a.tar.gz
Introduce macros to manipulate the SPSR
This patch introduces macros (SPSR_64 and SPSR_32) to create a SPSR for both aarch32 and aarch64 execution states. These macros allow the user to set fields in the SPSR depending upon its format. The make_spsr() function which did not allow manipulation of all the fields in the aarch32 SPSR has been replaced by these new macros. Change-Id: I9425dda0923e8d5f03d03ddb8fa0e28392c4c61e
Diffstat (limited to 'bl2/bl2_main.c')
-rw-r--r--bl2/bl2_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index ac28559..4a54bf1 100644
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -140,7 +140,7 @@ void bl2_main(void)
* well.
*/
bl2_to_bl31_args->bl33_image_info.spsr =
- make_spsr(mode, MODE_SP_ELX, MODE_RW_64);
+ SPSR_64(mode, MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS);
bl2_to_bl31_args->bl33_image_info.security_state = NON_SECURE;
if (bl32_base) {
@@ -165,7 +165,7 @@ void bl2_main(void)
* BL31 as an argument.
*/
run_image(bl31_base,
- make_spsr(MODE_EL3, MODE_SP_ELX, MODE_RW_64),
+ SPSR_64(MODE_EL3, MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS),
SECURE,
(void *) bl2_to_bl31_args,
NULL);