diff options
| author | Tom Rini <trini@konsulko.com> | 2025-02-20 11:21:41 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-02-20 11:21:41 -0600 |
| commit | 313b9856f95419b01df7cc6b9a16f7b07d9fe13c (patch) | |
| tree | e7dbb656e3fc05ad4a7fa7a67c89ba0945cfcfc3 /lib/efi_loader/efi_disk.c | |
| parent | 7a6dbb9dbe2ed4f6e51b3902fc7aa5a425f5f203 (diff) | |
| parent | 5ce629db2512d70f298bc1d422fefad63a74c7f5 (diff) | |
Merge tag 'efi-2025-04-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi
CI:
* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/24709
UEFI:
* create a parent device for all EFI block devices
* move lmb_map_update_notify() to EFI
* make efi_add_memory_map_pg() static
* remove comparisons to string literals from runtime
* ix potential deref-after-null
Other:
* avoid superfluous value check in lmb_map_update_notify()
* support more efi protocols in uuid_guid_get_str()
Diffstat (limited to 'lib/efi_loader/efi_disk.c')
| -rw-r--r-- | lib/efi_loader/efi_disk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 1f3de0a2339..5452640354e 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -531,7 +531,8 @@ static efi_status_t efi_disk_add_dev( /* Store first EFI system partition */ if (part && efi_system_partition.uclass_id == UCLASS_INVALID) { - if (part_info->bootable & PART_EFI_SYSTEM_PARTITION) { + if (part_info && + part_info->bootable & PART_EFI_SYSTEM_PARTITION) { efi_system_partition.uclass_id = desc->uclass_id; efi_system_partition.devnum = desc->devnum; efi_system_partition.part = part; |