Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[platform/kernel/u-boot.git] / include / uuid.h

diff --git a/include/uuid.h b/include/uuid.h
index 73c5a89..4a4883d 100644 (file)
--- a/include/uuid.h
+++ b/include/uuid.h
@@ -23,6 +23,7 @@ struct uuid {
 #define UUID_STR_FORMAT_GUID   BIT(0)
 #define UUID_STR_UPPER_CASE    BIT(1)
 
+/* Use UUID_STR_LEN + 1 for string space */
 #define UUID_STR_LEN           36
 #define UUID_BIN_LEN           sizeof(struct uuid)
 
@@ -39,10 +40,8 @@ int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin,
                    int str_format);
 void uuid_bin_to_str(const unsigned char *uuid_bin, char *uuid_str,
                     int str_format);
-#ifdef CONFIG_PARTITION_TYPE_GUID
 int uuid_guid_get_bin(const char *guid_str, unsigned char *guid_bin);
-int uuid_guid_get_str(const unsigned char *guid_bin, char *guid_str);
-#endif
+const char *uuid_guid_get_str(const unsigned char *guid_bin);
 void gen_rand_uuid(unsigned char *uuid_bin);
 void gen_rand_uuid_str(char *uuid_str, int str_format);
 #endif