diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-05-11 16:04:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-11 16:04:52 +0100 |
| commit | d6104f5ab4e68f92cf97f6a3e55395c71ed137ac (patch) | |
| tree | 4c9488add4622ce77fc328e34efe6f4bb7289873 /plat/mediatek | |
| parent | 78b7134927422425bcad3413cf78783e3eaf633c (diff) | |
| parent | b10d44995eb652675863c2cc6a7726683613da0d (diff) | |
Merge pull request #927 from jeenu-arm/state-switch
Execution state switch
Diffstat (limited to 'plat/mediatek')
| -rw-r--r-- | plat/mediatek/mt6795/bl31_plat_setup.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/plat/mediatek/mt6795/bl31_plat_setup.c b/plat/mediatek/mt6795/bl31_plat_setup.c index 2a4a7ed7..a70d1031 100644 --- a/plat/mediatek/mt6795/bl31_plat_setup.c +++ b/plat/mediatek/mt6795/bl31_plat_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -336,20 +336,15 @@ void enable_ns_access_to_cpuectlr(void) static entry_point_info_t *bl31_plat_get_next_kernel64_ep_info(void) { entry_point_info_t *next_image_info; - unsigned long el_status; unsigned int mode; - el_status = 0; mode = 0; /* Kernel image is always non-secured */ next_image_info = &bl33_image_ep_info; /* Figure out what mode we enter the non-secure world in */ - el_status = read_id_aa64pfr0_el1() >> ID_AA64PFR0_EL2_SHIFT; - el_status &= ID_AA64PFR0_ELX_MASK; - - if (el_status) { + if (EL_IMPLEMENTED(2)) { INFO("Kernel_EL2\n"); mode = MODE_EL2; } else{ |