| Message ID | 1434370862-8203-4-git-send-email-hs@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Jun 15, 2015 at 02:21:01PM +0200, Heiko Schocher wrote: > fix compiler warnings if compiled for SPL without > serial port support (CONFIG_SPL_SERIAL_SUPPORT is > not set). > > Signed-off-by: Heiko Schocher <hs@denx.de> [snip] > @@ -121,7 +128,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, > } lb; > int i; > #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA > - uint64_t __maybe_unsued x; > + uint64_t x; > #else > uint32_t __maybe_unused x; > #endif Wait, why do we need this?
Hello Tom, Am 15.06.2015 16:43, schrieb Tom Rini: > On Mon, Jun 15, 2015 at 02:21:01PM +0200, Heiko Schocher wrote: > >> fix compiler warnings if compiled for SPL without >> serial port support (CONFIG_SPL_SERIAL_SUPPORT is >> not set). >> >> Signed-off-by: Heiko Schocher <hs@denx.de> > [snip] >> @@ -121,7 +128,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, >> } lb; >> int i; >> #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA >> - uint64_t __maybe_unsued x; >> + uint64_t x; >> #else >> uint32_t __maybe_unused x; >> #endif > > Wait, why do we need this? Hmm... good question ... this seems to make no sense ... I removed this junk and started a new build for all boards ... bye, Heiko
diff --git a/lib/display_options.c b/lib/display_options.c index 6d9c6aa..17814c7 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -25,7 +25,10 @@ int display_options (void) void print_freq(uint64_t freq, const char *s) { - unsigned long m = 0, n; + 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; @@ -45,7 +48,9 @@ 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) { @@ -58,7 +63,9 @@ 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); @@ -121,7 +128,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, } lb; int i; #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA - uint64_t __maybe_unsued x; + uint64_t x; #else uint32_t __maybe_unused x; #endif
fix compiler warnings if compiled for SPL without serial port support (CONFIG_SPL_SERIAL_SUPPORT is not set). Signed-off-by: Heiko Schocher <hs@denx.de> --- lib/display_options.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)