aboutsummaryrefslogtreecommitdiff
path: root/lib/uuid.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-07-24 19:51:05 -0400
committerTom Rini <trini@konsulko.com>2023-07-24 19:51:05 -0400
commit94e7cb181ad6bd25d36a11c58e0df64e9f815888 (patch)
treeecd308f65b3b7e5f709cb09c9766f1fc8edb7783 /lib/uuid.c
parentd927d1a80843e1c3e2a3f0b8f6150790bef83da1 (diff)
downloadu-boot-94e7cb181ad6bd25d36a11c58e0df64e9f815888.zip
u-boot-94e7cb181ad6bd25d36a11c58e0df64e9f815888.tar.gz
u-boot-94e7cb181ad6bd25d36a11c58e0df64e9f815888.tar.bz2
Revert "Merge branch '2023-07-24-introduce-FF-A-suppport'"
This reverts commit d927d1a80843e1c3e2a3f0b8f6150790bef83da1, reversing changes made to c07ad9520c6190070513016fdb495d4703a4a853. These changes do not pass CI currently. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib/uuid.c')
-rw-r--r--lib/uuid.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/lib/uuid.c b/lib/uuid.c
index d018700..ab30fbf 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -1,10 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright 2011 Calxeda, Inc.
- * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com>
- *
- * Authors:
- * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
*/
#include <common.h>
@@ -358,50 +354,6 @@ int uuid_str_to_bin(const char *uuid_str, unsigned char *uuid_bin,
return 0;
}
-/**
- * uuid_str_to_le_bin() - Convert string UUID to little endian binary data.
- * @uuid_str: pointer to UUID string
- * @uuid_bin: pointer to allocated array for little endian output [16B]
- *
- * UUID string is 36 characters (36 bytes):
- *
- * xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
- *
- * where x is a hexadecimal character. Fields are separated by '-'s.
- * When converting to a little endian binary UUID, the string fields are reversed.
- *
- * Return:
- *
- * uuid_bin filled with little endian UUID data
- * On success 0 is returned. Otherwise, failure code.
- */
-int uuid_str_to_le_bin(const char *uuid_str, unsigned char *uuid_bin)
-{
- u16 tmp16;
- u32 tmp32;
- u64 tmp64;
-
- if (!uuid_str_valid(uuid_str) || !uuid_bin)
- return -EINVAL;
-
- tmp32 = cpu_to_le32(hextoul(uuid_str, NULL));
- memcpy(uuid_bin, &tmp32, 4);
-
- tmp16 = cpu_to_le16(hextoul(uuid_str + 9, NULL));
- memcpy(uuid_bin + 4, &tmp16, 2);
-
- tmp16 = cpu_to_le16(hextoul(uuid_str + 14, NULL));
- memcpy(uuid_bin + 6, &tmp16, 2);
-
- tmp16 = cpu_to_le16(hextoul(uuid_str + 19, NULL));
- memcpy(uuid_bin + 8, &tmp16, 2);
-
- tmp64 = cpu_to_le64(simple_strtoull(uuid_str + 24, NULL, 16));
- memcpy(uuid_bin + 10, &tmp64, 6);
-
- return 0;
-}
-
/*
* uuid_bin_to_str() - convert big endian binary data to string UUID or GUID.
*