X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib%2Fdisplay_options.c;h=83ea4decb53198fcc5ced9ae9f104a766afe5e8b;hb=baaaa7539c7511e7e90453ecf0f20d8eaeeb70c6;hp=24d8f554e51661d827f4bcdccedc83c40a8aba1b;hpb=3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c;p=u-boot diff --git a/lib/display_options.c b/lib/display_options.c index 24d8f554e5..83ea4decb5 100644 --- a/lib/display_options.c +++ b/lib/display_options.c @@ -25,7 +25,7 @@ int display_options (void) void print_freq(uint64_t freq, const char *s) { - unsigned long m = 0, n; + unsigned long m = 0; uint32_t f; static const char names[] = {'G', 'M', 'K'}; unsigned long d = 1e9; @@ -45,7 +45,6 @@ void print_freq(uint64_t freq, const char *s) } f = do_div(freq, d); - n = freq; /* If there's a remainder, show the first few digits */ if (f) { @@ -58,7 +57,7 @@ void print_freq(uint64_t freq, const char *s) m = (m / 10) + (m % 100 >= 50); } - printf("%lu", n); + printf("%lu", (unsigned long) freq); if (m) printf(".%ld", m); printf(" %cHz%s", c, s); @@ -121,9 +120,9 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, } lb; int i; #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA - uint64_t x; + uint64_t __maybe_unused x; #else - uint32_t x; + uint32_t __maybe_unused x; #endif if (linelen*width > MAX_LINE_LENGTH_BYTES) @@ -152,7 +151,7 @@ int print_buffer(ulong addr, const void *data, uint width, uint count, else x = lb.uc[i] = *(volatile uint8_t *)data; #ifdef CONFIG_SYS_SUPPORT_64BIT_DATA - printf(" %0*" PRIx64, width * 2, x); + printf(" %0*llx", width * 2, (long long)x); #else printf(" %0*x", width * 2, x); #endif