diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-22 15:43:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-22 15:43:36 -0500 |
| commit | da158ec5f2db86d88a631c05c540ba5ee1937a77 (patch) | |
| tree | 2aec2712bc2db6417fc9e5660b8a5c2e7b04ecee /disk | |
| parent | e6786b0354372c8a68d01e4d633a19cdce373b70 (diff) | |
| parent | f5e9035043fb48baea93ccb3165e75f486906213 (diff) | |
| download | u-boot-da158ec5f2db86d88a631c05c540ba5ee1937a77.tar.gz | |
Merge tag 'efi-2022-04-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efiWIP/22Jan2022
Pull request for efi-2022-04-rc1-2
Documentation:
* describe printf() format codes
UEFI
* enable more algorithms for UEFI image verification, e.g. SHA256-RSA2048
General
* simplify printing short texts for GUIDs
* provide a unit test for printing GUIDs
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part_efi.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index 611654fa18d..f1f3e5bceff 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -221,8 +221,7 @@ void part_print_efi(struct blk_desc *dev_desc) ALLOC_CACHE_ALIGN_BUFFER_PAD(gpt_header, gpt_head, 1, dev_desc->blksz); gpt_entry *gpt_pte = NULL; int i = 0; - char uuid[UUID_STR_LEN + 1]; - unsigned char *uuid_bin; + unsigned char *uuid; /* This function validates AND fills in the GPT header and PTE */ if (find_valid_gpt(dev_desc, gpt_head, &gpt_pte) != 1) @@ -245,17 +244,13 @@ void part_print_efi(struct blk_desc *dev_desc) le64_to_cpu(gpt_pte[i].ending_lba), print_efiname(&gpt_pte[i])); printf("\tattrs:\t0x%016llx\n", gpt_pte[i].attributes.raw); - uuid_bin = (unsigned char *)gpt_pte[i].partition_type_guid.b; - uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID); - printf("\ttype:\t%s\n", uuid); - if (CONFIG_IS_ENABLED(PARTITION_TYPE_GUID)) { - const char *type = uuid_guid_get_str(uuid_bin); - if (type) - printf("\ttype:\t%s\n", type); - } - uuid_bin = (unsigned char *)gpt_pte[i].unique_partition_guid.b; - uuid_bin_to_str(uuid_bin, uuid, UUID_STR_FORMAT_GUID); - printf("\tguid:\t%s\n", uuid); + uuid = (unsigned char *)gpt_pte[i].partition_type_guid.b; + if (CONFIG_IS_ENABLED(PARTITION_TYPE_GUID)) + printf("\ttype:\t%pUl\n\t\t(%pUs)\n", uuid, uuid); + else + printf("\ttype:\t%pUl\n", uuid); + uuid = (unsigned char *)gpt_pte[i].unique_partition_guid.b; + printf("\tguid:\t%pUl\n", uuid); } /* Remember to free pte */ |