diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-14 09:48:26 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-14 09:51:39 -0500 |
| commit | 14b254b5f5a841e1227e3667cf94fbcdadaf720e (patch) | |
| tree | 644eb1e21e312831970bbd682bd2fa3a6378e5c1 /lib/efi_loader/efi_disk.c | |
| parent | cffda7ddb84e4b1d99777f362410cedf058108f0 (diff) | |
| parent | 2e716b8e299309139daa9513707951c622fc2bdf (diff) | |
Merge tag 'efi-2020-01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-01-rc3
The following changes for the UEFI subsystem are provided:
* allow building UEFI binaries on the sandbox
* enable access to file systems without partition tables
* correctly check the return value of efi_dp_from_file()
Diffstat (limited to 'lib/efi_loader/efi_disk.c')
| -rw-r--r-- | lib/efi_loader/efi_disk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 861fcaf374..ed7fb3f7d3 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -337,7 +337,9 @@ static efi_status_t efi_disk_add_dev( diskobj->dp); if (ret != EFI_SUCCESS) return ret; - if (part >= 1 && efi_fs_exists(desc, part)) { + /* partitions or whole disk without partitions */ + if ((part || desc->part_type == PART_TYPE_UNKNOWN) && + efi_fs_exists(desc, part)) { diskobj->volume = efi_simple_file_system(desc, part, diskobj->dp); ret = efi_add_protocol(&diskobj->header, |