diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-22 10:27:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-22 10:27:24 -0400 |
| commit | 2fdb5cd69ce05392f2f7e556484a34ed0a77f43c (patch) | |
| tree | 816ccdec2782678913b822218b4884a0af21d839 /lib/efi_loader/efi_setup.c | |
| parent | 74ce1f8c6f29ddc153d31d01703980c99ee7a7ee (diff) | |
| parent | 0a87e05dbd1b6ddafd61603e2a9c12659168ae65 (diff) | |
Merge tag 'efi-2020-07-rc3-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-07-rc3 (2)
Problems fixed with these patches are:
* UEFI sub-system not working with virtio block devices
* Missing SATA support in UEFI sub-system
* A superfluous debug statement
Diffstat (limited to 'lib/efi_loader/efi_setup.c')
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index 26a74232036..dd0c53fc239 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -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(); + /* Initialize root node */ + ret = efi_root_node_register(); + if (ret != EFI_SUCCESS) + goto out; + #ifdef CONFIG_PARTITIONS ret = efi_disk_register(); if (ret != EFI_SUCCESS) @@ -175,11 +180,6 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; - /* Initialize root node */ - ret = efi_root_node_register(); - if (ret != EFI_SUCCESS) - goto out; - /* Initialize EFI driver uclass */ ret = efi_driver_init(); if (ret != EFI_SUCCESS) |