| diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c | |
| index d91bd3e8c..4dd6edeb7 100644 | |
| --- a/plat/arm/common/arm_common.c | |
| +++ b/plat/arm/common/arm_common.c | |
| @@ -86,7 +86,7 @@ uint32_t arm_get_spsr(unsigned int image_id) | |
| #ifdef __aarch64__ | |
| /* Figure out what mode we enter the non-secure world in */ | |
| - mode = (el_implemented(2) != EL_IMPL_NONE) ? MODE_EL2 : MODE_EL1; | |
| + mode = MODE_EL1; | |
| /* | |
| * TODO: Consider the possibility of specifying the SPSR in |