diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-23 18:42:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-23 18:42:00 -0400 |
| commit | 46a06ed82a81dfcb451fe82381c59c1d0a6667a1 (patch) | |
| tree | a4b23b20380a7850521338c5dfe5a5ab6ae47d09 /lib/efi_loader/efi_device_path.c | |
| parent | 9bb99fa95826d1a608737ca821977b4136a1a278 (diff) | |
| parent | d97e98c887ed8fa4a339350c02f093f03cd1cf4d (diff) | |
Merge tag 'efi-2022-07-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-07-rc1-3
Documentation:
* Document image size parameter of bootefi command
UEFI:
* avoid building partition support in SPL/TPL where not required
* improve integration of EFI subsystem and driver model
* restore ability to boot arbitrary blob
Diffstat (limited to 'lib/efi_loader/efi_device_path.c')
| -rw-r--r-- | lib/efi_loader/efi_device_path.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 0542aaae16c..50a988c5613 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -864,11 +864,16 @@ static void *dp_part_node(void *buf, struct blk_desc *desc, int part) break; case SIG_TYPE_GUID: hddp->signature_type = 2; +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) + /* info.uuid exists only with PARTITION_UUIDS */ if (uuid_str_to_bin(info.uuid, - hddp->partition_signature, 1)) + hddp->partition_signature, + UUID_STR_FORMAT_GUID)) { log_warning( - "Partition no. %d: invalid guid: %s\n", + "Partition %d: invalid GUID %s\n", part, info.uuid); + } +#endif break; } |