mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
efi_loader: change setup sequence
If we want to restore variables from disk, we need to initialize block devices before variables. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
parent
5827c25458
commit
16ad946f41
1 changed files with 5 additions and 5 deletions
|
@ -135,6 +135,11 @@ efi_status_t efi_init_obj_list(void)
|
|||
/* On ARM switch from EL3 or secure mode to EL2 or non-secure mode */
|
||||
switch_to_non_secure_mode();
|
||||
|
||||
#ifdef CONFIG_PARTITIONS
|
||||
ret = efi_disk_register();
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto out;
|
||||
#endif
|
||||
/* Initialize variable services */
|
||||
ret = efi_init_variables();
|
||||
if (ret != EFI_SUCCESS)
|
||||
|
@ -183,11 +188,6 @@ efi_status_t efi_init_obj_list(void)
|
|||
ret = efi_console_register();
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto out;
|
||||
#ifdef CONFIG_PARTITIONS
|
||||
ret = efi_disk_register();
|
||||
if (ret != EFI_SUCCESS)
|
||||
goto out;
|
||||
#endif
|
||||
#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
|
||||
ret = efi_gop_register();
|
||||
if (ret != EFI_SUCCESS)
|
||||
|
|
Loading…
Reference in a new issue