From: Vincent Tinelli Date: Mon, 27 Feb 2017 14:11:15 +0000 (+0200) Subject: gpt: Fix uuid string format X-Git-Tag: v2017.05-rc1~68 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9da52f8f67b32a21a687602681f6b6b6b7df480b;p=u-boot gpt: Fix uuid string format Change GPT UUID string format from UUID to GUID per specification. Signed-off-by: Vincent Tinelli Reviewed-by: Simon Glass --- diff --git a/cmd/gpt.c b/cmd/gpt.c index 196f506335..3e98821868 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -54,7 +54,7 @@ static int extract_env(const char *str, char **env) if (e == NULL) { #ifdef CONFIG_RANDOM_UUID debug("%s unset. ", str); - gen_rand_uuid_str(uuid_str, UUID_STR_FORMAT_STD); + gen_rand_uuid_str(uuid_str, UUID_STR_FORMAT_GUID); setenv(s, uuid_str); e = getenv(s); diff --git a/disk/part_efi.c b/disk/part_efi.c index 893cbbdbda..db0c890d5b 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -463,7 +463,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, str_uuid = partitions[i].uuid; bin_uuid = gpt_e[i].unique_partition_guid.b; - if (uuid_str_to_bin(str_uuid, bin_uuid, UUID_STR_FORMAT_STD)) { + if (uuid_str_to_bin(str_uuid, bin_uuid, UUID_STR_FORMAT_GUID)) { printf("Partition no. %d: invalid guid: %s\n", i, str_uuid); return -1;