diff mbox

[U-Boot,v1,1/1] lib/display_options: Fix print_freq

Message ID 1439915133-20384-1-git-send-email-suriyan.r@gmail.com
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Suriyan Ramasami Aug. 18, 2015, 4:25 p.m. UTC
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>
---
 lib/display_options.c | 6 ------
 1 file changed, 6 deletions(-)

Comments

Simon Glass Aug. 22, 2015, 12:36 a.m. UTC | #1
Hi,

On 18 August 2015 at 10:25, Suriyan Ramasami <suriyan.r@gmail.com> wrote:
> 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>
> ---
>  lib/display_options.c | 6 ------
>  1 file changed, 6 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>

That's strange. Your patch looks correct to me.

Regards,
Simon
diff mbox

Patch

diff --git a/lib/display_options.c b/lib/display_options.c
index df134cd..80316a4 100644
--- a/lib/display_options.c
+++ b/lib/display_options.c
@@ -26,9 +26,7 @@  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 +46,7 @@  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 +59,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
 	if (m)
 		printf(".%ld", m);
 	printf(" %cHz%s", c, s);