Merge tag 'u-boot-imx-20200609' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index c6467ecd5ff9d08a8fa03e5df3064b6b273162bb..de9ef902b96fff3a1044e430dd49e69fcedc4325 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -19,6 +19,7 @@
 #include <div64.h>
 #include <hexdump.h>
 #include <stdarg.h>
+#include <uuid.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
@@ -320,7 +321,6 @@ static char *device_path_string(char *buf, char *end, void *dp, int field_width,
 #endif
 #endif
 
-#ifdef CONFIG_CMD_NET
 static char *mac_address_string(char *buf, char *end, u8 *addr, int field_width,
                                int precision, int flags)
 {
@@ -382,7 +382,6 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
        return string(buf, end, ip4_addr, field_width, precision,
                      flags & ~SPECIAL);
 }
-#endif
 
 #ifdef CONFIG_LIB_UUID
 /*
@@ -474,7 +473,6 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                        break;
                }
                break;
-#ifdef CONFIG_CMD_NET
        case 'm':
                flags |= SPECIAL;
                /* Fallthrough */
@@ -493,7 +491,6 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                                               precision, flags);
                flags &= ~SPECIAL;
                break;
-#endif
 #ifdef CONFIG_LIB_UUID
        case 'U':
                return uuid_string(buf, end, ptr, field_width, precision,