diff options
| author | Tom Rini <[email protected]> | 2024-07-03 09:05:52 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-03 09:05:52 -0600 |
| commit | 4d3383623dd04be230ebb962c2f79bb3f3d502d9 (patch) | |
| tree | 8c0b34c49d3a3cee72f6d9680ea0afc93d09f793 /boot | |
| parent | 65fbdab27224ee3943a89496b21862db83c34da2 (diff) | |
| parent | c85a05a5d87ce6f077c41d7e63a4a7953ddb351c (diff) | |
Merge tag 'dm-pull-2jun24-take2' of https://source.denx.de/u-boot/custodians/u-boot-dm
buildman CI improvements
binman fixes and assumed size
partial tools fixes for Python 3.12
patman enhancements
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootmeth_cros.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c index 645b8bed102..1d5fd8b193d 100644 --- a/boot/bootmeth_cros.c +++ b/boot/bootmeth_cros.c @@ -147,7 +147,7 @@ static int scan_part(struct udevice *blk, int partnum, { struct blk_desc *desc = dev_get_uclass_plat(blk); struct vb2_keyblock *hdr; - struct uuid type; + efi_guid_t type; ulong num_blks; int ret; @@ -160,7 +160,7 @@ static int scan_part(struct udevice *blk, int partnum, /* Check for kernel partition type */ log_debug("part %x: type=%s\n", partnum, info->type_guid); - if (uuid_str_to_bin(info->type_guid, (u8 *)&type, UUID_STR_FORMAT_GUID)) + if (uuid_str_to_bin(info->type_guid, type.b, UUID_STR_FORMAT_GUID)) return log_msg_ret("typ", -EINVAL); if (memcmp(&cros_kern_type, &type, sizeof(type))) |