From e9015b304ad2a39a03f2684dadeabef474b7addb Mon Sep 17 00:00:00 2001 From: Suriyan Ramasami Date: Tue, 18 Aug 2015 09:25:33 -0700 Subject: 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 Acked-by: Simon Glass Acked-by: Heiko Schocher Reviewed-by: Joe Hershberger --- lib/display_options.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'lib/display_options.c') diff --git a/lib/display_options.c b/lib/display_options.c index df134cd23a..83ea4decb5 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -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); -- cgit v1.2.1