Travis: Expose build dir as variable

[u-boot] / lib / display_options.c

diff --git a/lib/display_options.c b/lib/display_options.c
index df134cd23a9671841dbff7d0361265d350106c83..29343fc00e3f070debd0a749541083bee59a096c 100644 (file)
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <config.h>
 #include <common.h>
+#include <console.h>
 #include <div64.h>
 #include <inttypes.h>
 #include <version.h>
@@ -26,9 +26,6 @@ int display_options (void)
 void print_freq(uint64_t freq, const char *s)
 {
        unsigned long m = 0;
-#if defined(CONFIG_SPL_SERIAL_SUPPORT)
-       unsigned long n;
-#endif
        uint32_t f;
        static const char names[] = {'G', 'M', 'K'};
        unsigned long d = 1e9;
@@ -48,9 +45,6 @@ void print_freq(uint64_t freq, const char *s)
        }
 
        f = do_div(freq, d);
-#if defined(CONFIG_SPL_SERIAL_SUPPORT)
-       n = freq;
-#endif
 
        /* If there's a remainder, show the first few digits */
        if (f) {
@@ -63,9 +57,7 @@ void print_freq(uint64_t freq, const char *s)
                        m = (m / 10) + (m % 100 >= 50);
        }
 
-#if defined(CONFIG_SPL_SERIAL_SUPPORT)
-       printf("%lu", n);
-#endif
+       printf("%lu", (unsigned long) freq);
        if (m)
                printf(".%ld", m);
        printf(" %cHz%s", c, s);