Merge git://git.denx.de/u-boot-net

[people/ms/u-boot.git] / lib / display_options.c

diff --git a/lib/display_options.c b/lib/display_options.c
index 3f32bcd8cf2dff807f64e8f0185f6f1fd8116e18..4ea27ca99d36827e20b0a93bf895494d50bf5255 100644 (file)
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -5,23 +5,90 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <config.h>
 #include <common.h>
+#include <console.h>
+#include <div64.h>
 #include <inttypes.h>
 #include <version.h>
 #include <linux/ctype.h>
 #include <asm/io.h>
 
-int display_options (void)
+char *display_options_get_banner_priv(bool newlines, const char *build_tag,
+                                     char *buf, int size)
 {
-#if defined(BUILD_TAG)
-       printf ("\n\n%s, Build: %s\n\n", version_string, BUILD_TAG);
-#else
-       printf ("\n\n%s\n\n", version_string);
+       int len;
+
+       len = snprintf(buf, size, "%s%s", newlines ? "\n\n" : "",
+                      version_string);
+       if (build_tag && len < size)
+               len += snprintf(buf + len, size - len, ", Build: %s",
+                               build_tag);
+       if (len > size - 3)
+               len = size - 3;
+       strcpy(buf + len, "\n\n");
+
+       return buf;
+}
+
+#ifndef BUILD_TAG
+#define BUILD_TAG NULL
 #endif
+
+char *display_options_get_banner(bool newlines, char *buf, int size)
+{
+       return display_options_get_banner_priv(newlines, BUILD_TAG, buf, size);
+}
+
+int display_options(void)
+{
+       char buf[DISPLAY_OPTIONS_BANNER_LENGTH];
+
+       display_options_get_banner(true, buf, sizeof(buf));
+       printf("%s", buf);
+
        return 0;
 }
 
+void print_freq(uint64_t freq, const char *s)
+{
+       unsigned long m = 0;
+       uint32_t f;
+       static const char names[] = {'G', 'M', 'K'};
+       unsigned long d = 1e9;
+       char c = 0;
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(names); i++, d /= 1000) {
+               if (freq >= d) {
+                       c = names[i];
+                       break;
+               }
+       }
+
+       if (!c) {
+               printf("%" PRIu64 " Hz%s", freq, s);
+               return;
+       }
+
+       f = do_div(freq, d);
+
+       /* If there's a remainder, show the first few digits */
+       if (f) {
+               m = f;
+               while (m > 1000)
+                       m /= 10;
+               while (m && !(m % 10))
+                       m /= 10;
+               if (m >= 100)
+                       m = (m / 10) + (m % 100 >= 50);
+       }
+
+       printf("%lu", (unsigned long) freq);
+       if (m)
+               printf(".%ld", m);
+       printf(" %cHz%s", c, s);
+}
+
 void print_size(uint64_t size, const char *s)
 {
        unsigned long m = 0, n;
@@ -79,9 +146,9 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
        } lb;
        int i;
 #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA
-       uint64_t x;
+       uint64_t __maybe_unused x;
 #else
-       uint32_t x;
+       uint32_t __maybe_unused x;
 #endif
 
        if (linelen*width > MAX_LINE_LENGTH_BYTES)
@@ -110,7 +177,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count,
                        else
                                x = lb.uc[i] = *(volatile uint8_t *)data;
 #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA
-                       printf(" %0*" PRIx64, width * 2, x);
+                       printf(" %0*llx", width * 2, (long long)x);
 #else
                        printf(" %0*x", width * 2, x);
 #endif