lib/display_options: Fix print_freq

Build without CONFIG_SPL_SERIAL_SUPPORT does not print the cpu freq.
I have seen this in the odroid U3 board, where on boot one sees this:
CPU:   Exynos4412 @  GHz
instead of:
CPU:   Exynos4412 @ 1 GHz

I am assuming that this change was done to get rid of compiler
warnings related to unused variables when building with
CONFIG_SPL_SERIAL_SUPPORT not being defined in an SPL build.

Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Suriyan Ramasami 2015-08-18 09:25:33 -07:00 committed by Tom Rini
parent b3537c08e1
commit e9015b304a

View File

@ -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);