diff options
author | Tom Rini <trini@konsulko.com> | 2022-09-09 14:10:51 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-09-09 15:07:05 -0400 |
commit | a5fc388ed966974256bc03b3d4db7ae1be0ed119 (patch) | |
tree | 5be3ecc2ce3483ea3134746aeb46017489efbcf6 /lib/efi_driver/efi_uclass.c | |
parent | e9de8c8c649044080371399a1ef4923b08632611 (diff) | |
parent | 8cf8ad353345cc4a92288b5136e7d714d2bdde4a (diff) |
Merge tag 'efi-2022-10-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-10-rc5
Documentation:
* man-page for tftpput
UEFI:
* fix driver binding protocol for block IO devices
* don't delete invalid handles
* add a unit test for the EFI Conformance Profile Table
Other:
* correct short text for tftpboot
Diffstat (limited to 'lib/efi_driver/efi_uclass.c')
-rw-r--r-- | lib/efi_driver/efi_uclass.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index b01ce89c84e..74dd0032437 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -71,6 +71,15 @@ static efi_status_t EFIAPI efi_uc_supported( EFI_ENTRY("%p, %p, %ls", this, controller_handle, efi_dp_str(remaining_device_path)); + /* + * U-Boot internal devices install protocols interfaces without calling + * ConnectController(). Hence we should not bind an extra driver. + */ + if (controller_handle->dev) { + ret = EFI_UNSUPPORTED; + goto out; + } + ret = EFI_CALL(systab.boottime->open_protocol( controller_handle, bp->ops->protocol, &interface, this->driver_binding_handle, |