| Message ID | 1440482349-12134-1-git-send-email-suriyan.r@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hello Suriyan, Am 25.08.2015 um 07:59 schrieb Suriyan Ramasami: > Build without CONFIG_SPL_SERIAL_SUPPORT does not print the cpu freq. > Booting an odroid U3 board, one sees this: > CPU: Exynos4412 @ GHz > instead of: > CPU: Exynos4412 @ 1 GHz > > This change was done to get rid of compiler warnings related to the > unused variable 'n' when CONFIG_SPL_SERIAL_SUPPORT is not defined in an > SPL build. Example board: smartweb > > Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> > --- > > v2: > * Get rid of variable 'n' altogether > > v1: > * Remove #ifdef CONFIG_SPL_SERIAL_SUPPORT > > lib/display_options.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) Thanks! Acked-by: Heiko Schocher<hs@denx.de> bye, Heiko > > diff --git a/lib/display_options.c b/lib/display_options.c > index df134cd..83ea4de 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); >
On Tue, Aug 25, 2015 at 12:59 AM, Suriyan Ramasami <suriyan.r@gmail.com> wrote: > Build without CONFIG_SPL_SERIAL_SUPPORT does not print the cpu freq. > Booting an odroid U3 board, one sees this: > CPU: Exynos4412 @ GHz > instead of: > CPU: Exynos4412 @ 1 GHz > > This change was done to get rid of compiler warnings related to the > unused variable 'n' when CONFIG_SPL_SERIAL_SUPPORT is not defined in an > SPL build. Example board: smartweb > > Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
On Mon, Aug 24, 2015 at 10:59:09PM -0700, Suriyan Ramasami wrote: > Build without CONFIG_SPL_SERIAL_SUPPORT does not print the cpu freq. > Booting an odroid U3 board, one sees this: > CPU: Exynos4412 @ GHz > instead of: > CPU: Exynos4412 @ 1 GHz > > This change was done to get rid of compiler warnings related to the > unused variable 'n' when CONFIG_SPL_SERIAL_SUPPORT is not defined in an > SPL build. Example board: smartweb > > Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> > Acked-by: Heiko Schocher<hs@denx.de> > Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Applied to u-boot/master, thanks!
diff --git a/lib/display_options.c b/lib/display_options.c index df134cd..83ea4de 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);
Build without CONFIG_SPL_SERIAL_SUPPORT does not print the cpu freq. Booting an odroid U3 board, one sees this: CPU: Exynos4412 @ GHz instead of: CPU: Exynos4412 @ 1 GHz This change was done to get rid of compiler warnings related to the unused variable 'n' when CONFIG_SPL_SERIAL_SUPPORT is not defined in an SPL build. Example board: smartweb Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> --- v2: * Get rid of variable 'n' altogether v1: * Remove #ifdef CONFIG_SPL_SERIAL_SUPPORT lib/display_options.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)