mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-24 05:30:37 +09:00
efi_loader: switch to non-secure mode later
Some ARMv7 boards using PSCI require to be in secure-mode when booted via 'bootz' or 'bootm'. During distro-boot 'bootefi bootmgr' is called to check if booting via UEFI is possible. With the change we change the switch from secure mode to non-secure mode is moved from the UEFI subsystem setup to just before calling StartImage(). Cc: Jernej Škrabec <jernej.skrabec@gmail.com> Reported by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
parent
688e88256f
commit
82d01f04fa
@ -8,6 +8,7 @@
|
|||||||
#define LOG_CATEGORY LOGC_EFI
|
#define LOG_CATEGORY LOGC_EFI
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <bootm.h>
|
||||||
#include <charset.h>
|
#include <charset.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <dm.h>
|
#include <dm.h>
|
||||||
@ -338,6 +339,9 @@ static efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options)
|
|||||||
efi_uintn_t exit_data_size = 0;
|
efi_uintn_t exit_data_size = 0;
|
||||||
u16 *exit_data = NULL;
|
u16 *exit_data = NULL;
|
||||||
|
|
||||||
|
/* On ARM switch from EL3 or secure mode to EL2 or non-secure mode */
|
||||||
|
switch_to_non_secure_mode();
|
||||||
|
|
||||||
/* Call our payload! */
|
/* Call our payload! */
|
||||||
ret = EFI_CALL(efi_start_image(handle, &exit_data_size, &exit_data));
|
ret = EFI_CALL(efi_start_image(handle, &exit_data_size, &exit_data));
|
||||||
if (ret != EFI_SUCCESS) {
|
if (ret != EFI_SUCCESS) {
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <bootm.h>
|
|
||||||
#include <efi_loader.h>
|
#include <efi_loader.h>
|
||||||
#include <efi_variable.h>
|
#include <efi_variable.h>
|
||||||
|
|
||||||
@ -188,9 +187,6 @@ efi_status_t efi_init_obj_list(void)
|
|||||||
/* Allow unaligned memory access */
|
/* Allow unaligned memory access */
|
||||||
allow_unaligned();
|
allow_unaligned();
|
||||||
|
|
||||||
/* On ARM switch from EL3 or secure mode to EL2 or non-secure mode */
|
|
||||||
switch_to_non_secure_mode();
|
|
||||||
|
|
||||||
/* Initialize root node */
|
/* Initialize root node */
|
||||||
ret = efi_root_node_register();
|
ret = efi_root_node_register();
|
||||||
if (ret != EFI_SUCCESS)
|
if (ret != EFI_SUCCESS)
|
||||||
|
Loading…
Reference in New Issue
Block a user