summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrzemyslaw Marczak <p.marczak@samsung.com>2014-04-02 10:20:05 +0200
committerTom Rini <trini@ti.com>2014-04-02 16:36:06 -0400
commit89c8230dec063d894aec1a7b5c58f1dcadced738 (patch)
treefa131e998ee221582493087f58625b4a8a99afab
parent4e4815feae4d37032a7afce18a4c26074c51f159 (diff)
downloadblackbird-obmc-uboot-89c8230dec063d894aec1a7b5c58f1dcadced738.tar.gz
blackbird-obmc-uboot-89c8230dec063d894aec1a7b5c58f1dcadced738.zip
new commands: uuid and guid - generate random unique identifier
Those commands basis on implementation of random UUID generator version 4 which is described in RFC4122. The same algorithm is used for generation both ids but string representation is different as below. char: 0 9 14 19 24 36 xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx UUID: be be be be be GUID: le le le be be Commands usage: - uuid [<varname>] - guid [<varname>] The result is saved in environment as a "varname" variable if argument is given, if not then it is printed. New config: - CONFIG_CMD_UUID Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Stephen Warren <swarren@nvidia.com> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: trini@ti.com
-rw-r--r--README2
-rw-r--r--include/config_fallbacks.h8
-rw-r--r--lib/uuid.c44
3 files changed, 49 insertions, 5 deletions
diff --git a/README b/README
index 7cb7c4f626..025386f52c 100644
--- a/README
+++ b/README
@@ -1012,7 +1012,7 @@ The following options need to be configured:
CONFIG_CMD_CDP * Cisco Discover Protocol support
CONFIG_CMD_MFSL * Microblaze FSL support
CONFIG_CMD_XIMG Load part of Multi Image
-
+ CONFIG_CMD_UUID * Generate random UUID or GUID string
EXAMPLE: If you want all functions except of network
support you can write:
diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index c6b20fd297..e6fb47be0b 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -58,14 +58,16 @@
#if (defined(CONFIG_PARTITION_UUIDS) || \
defined(CONFIG_EFI_PARTITION) || \
defined(CONFIG_RANDOM_UUID) || \
+ defined(CONFIG_CMD_UUID) || \
defined(CONFIG_BOOTP_PXE)) && \
!defined(CONFIG_LIB_UUID)
#define CONFIG_LIB_UUID
#endif
-#if defined(CONFIG_RANDOM_UUID) && \
- !defined(CONFIG_LIB_RAND) && \
- !defined(CONFIG_LIB_HW_RAND)
+#if (defined(CONFIG_RANDOM_UUID) || \
+ defined(CONFIG_CMD_UUID)) && \
+ (!defined(CONFIG_LIB_RAND) && \
+ !defined(CONFIG_LIB_HW_RAND))
#define CONFIG_LIB_RAND
#endif
diff --git a/lib/uuid.c b/lib/uuid.c
index 44d0c932ac..f32b602316 100644
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -4,6 +4,7 @@
* SPDX-License-Identifier: GPL-2.0+
*/
+#include <common.h>
#include <linux/ctype.h>
#include <errno.h>
#include <common.h>
@@ -171,7 +172,7 @@ void uuid_bin_to_str(unsigned char *uuid_bin, char *uuid_str, int str_format)
*
* @param uuid_bin - pointer to allocated array [16B]. Output is in big endian.
*/
-#ifdef CONFIG_RANDOM_UUID
+#if defined(CONFIG_RANDOM_UUID) || defined(CONFIG_CMD_UUID)
void gen_rand_uuid(unsigned char *uuid_bin)
{
struct uuid uuid;
@@ -210,4 +211,45 @@ void gen_rand_uuid_str(char *uuid_str, int str_format)
/* Convert UUID bin to UUID or GUID formated STRING */
uuid_bin_to_str(uuid_bin, uuid_str, str_format);
}
+
+#ifdef CONFIG_CMD_UUID
+int do_uuid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ char uuid[UUID_STR_LEN + 1];
+ int str_format;
+
+ if (!strcmp(argv[0], "uuid"))
+ str_format = UUID_STR_FORMAT_STD;
+ else
+ str_format = UUID_STR_FORMAT_GUID;
+
+ if (argc > 2)
+ return CMD_RET_USAGE;
+
+ gen_rand_uuid_str(uuid, str_format);
+
+ if (argc == 1)
+ printf("%s\n", uuid);
+ else
+ setenv(argv[1], uuid);
+
+ return CMD_RET_SUCCESS;
+}
+
+U_BOOT_CMD(uuid, CONFIG_SYS_MAXARGS, 1, do_uuid,
+ "UUID - generate random Universally Unique Identifier",
+ "[<varname>]\n"
+ "Argument:\n"
+ "varname: for set result in a environment variable\n"
+ "e.g. uuid uuid_env"
+);
+
+U_BOOT_CMD(guid, CONFIG_SYS_MAXARGS, 1, do_uuid,
+ "GUID - generate Globally Unique Identifier based on random UUID",
+ "[<varname>]\n"
+ "Argument:\n"
+ "varname: for set result in a environment variable\n"
+ "e.g. guid guid_env"
+);
+#endif
#endif
OpenPOWER on IntegriCloud