summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Tinelli <vincent.tinelli@intel.com>2017-02-27 14:11:15 (GMT)
committerTom Rini <trini@konsulko.com>2017-03-17 18:15:10 (GMT)
commit9da52f8f67b32a21a687602681f6b6b6b7df480b (patch)
treef57f6f72cd3ae43aedb6dc05a82ccf2b8a4e542e
parent2c79fd401982c7d6c5e77c09bc7035f8a3766c88 (diff)
downloadu-boot-9da52f8f67b32a21a687602681f6b6b6b7df480b.tar.xz
gpt: Fix uuid string format
Change GPT UUID string format from UUID to GUID per specification. Signed-off-by: Vincent Tinelli <vincent.tinelli@intel.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--cmd/gpt.c2
-rw-r--r--disk/part_efi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gpt.c b/cmd/gpt.c
index 196f506..3e98821 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 893cbbd..db0c890 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;