diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-20 10:19:04 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-20 10:19:04 -0400 |
| commit | 0274eb61e1f2a8e053fb028b6c668c67c0b75b9c (patch) | |
| tree | d109142eaa8cba2ead501a544faf857cadc14c95 /lib/efi_driver/efi_block_device.c | |
| parent | 5dcfc99b2b17fa1497adea47a50bf7c7a6ba5709 (diff) | |
| parent | e07368ea57d224557570a6715dcffdbc883a8079 (diff) | |
Merge tag 'efi-2023-10-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2023-10-rc1-2
UEFI:
* test: avoid function name 'setup' in capsule tests to not treat it as
a fixture
* ensure that device paths for USB block devices are unique
* enable having multiple EFI_LOADER block devices
* use InstallMultipleProtocolInterfaces() in TCG protocol implementation to
increase UEFI compliance
Diffstat (limited to 'lib/efi_driver/efi_block_device.c')
| -rw-r--r-- | lib/efi_driver/efi_block_device.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index add00eeebbe..e3abd90275c 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -124,10 +124,8 @@ efi_bl_create_block_device(efi_handle_t handle, void *interface) struct efi_block_io *io = interface; struct efi_blk_plat *plat; - devnum = blk_find_max_devnum(UCLASS_EFI_LOADER); - if (devnum == -ENODEV) - devnum = 0; - else if (devnum < 0) + devnum = blk_next_free_devnum(UCLASS_EFI_LOADER); + if (devnum < 0) return EFI_OUT_OF_RESOURCES; name = calloc(1, 18); /* strlen("efiblk#2147483648") + 1 */ |