Merge pull request #927 from jeenu-arm/state-switch

[project/bcm63xx/atf.git] / bl31 / bl31_main.c

diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index ca18a80aeb011ebf45f934e7f09b178d8288ad77..c53f8a220515474614b4cb91608b243c7b153237 100644 (file)
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -148,8 +148,7 @@ void bl31_prepare_next_image_entry(void)
         * Ensure that the build flag to save AArch32 system registers in CPU
         * context is not set for AArch64-only platforms.
         */
-       if (((read_id_aa64pfr0_el1() >> ID_AA64PFR0_EL1_SHIFT)
-                       & ID_AA64PFR0_ELX_MASK) == 0x1) {
+       if (EL_IMPLEMENTED(1) == EL_IMPL_A64ONLY) {
                ERROR("EL1 supports AArch64-only. Please set build flag "
                                "CTX_INCLUDE_AARCH32_REGS = 0");
                panic();