diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-07 11:51:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-07 11:51:05 -0400 |
| commit | 11ef7f07ce60b60fb78c330b3ae35fd1037e50c1 (patch) | |
| tree | fbbc12ec51fc3651d5fce002ebf38c76621dac8e /lib/efi_loader/efi_setup.c | |
| parent | f5717231abad983b4d8f87db612ae60dec86cb1b (diff) | |
| parent | a75e8355eaa561ebd6128c92a90288d5d7c1f060 (diff) | |
Merge tag 'efi-2023-01-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-01-rc1
UEFI:
* Provide driver binding protocol to registered events for block devices
* Code simplification and refactoring
* Fix pylint errors in test_efi_secboot
Other:
* Improve checks for register ranges
Diffstat (limited to 'lib/efi_loader/efi_setup.c')
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index c633fcd91e..9d7189336d 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -198,7 +198,8 @@ static efi_status_t __efi_init_early(void) if (ret != EFI_SUCCESS) goto out; - ret = efi_disk_init(); + /* Initialize EFI driver uclass */ + ret = efi_driver_init(); out: return ret; } @@ -319,11 +320,6 @@ efi_status_t efi_init_obj_list(void) if (ret != EFI_SUCCESS) goto out; - /* Initialize EFI driver uclass */ - ret = efi_driver_init(); - if (ret != EFI_SUCCESS) - goto out; - if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT)) { ret = efi_load_capsule_drivers(); if (ret != EFI_SUCCESS) |