diff options
| author | Heiko Schocher <hs@denx.de> | 2015-06-29 09:10:46 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-12 20:47:13 -0400 |
| commit | 80402f34f8e1f46134a0272ff4d34be64ff7380b (patch) | |
| tree | 5fcf26d057c39f522fe4cf6ed77966dc322d72b8 /lib | |
| parent | acb5ff021eb65931d3e970da8ff0a00dda0cd088 (diff) | |
| download | talos-obmc-uboot-80402f34f8e1f46134a0272ff4d34be64ff7380b.tar.gz talos-obmc-uboot-80402f34f8e1f46134a0272ff4d34be64ff7380b.zip | |
spl, common, serial: build SPL without serial support
This patch enables building SPL without
CONFIG_SPL_SERIAL_SUPPORT support.
Signed-off-by: Heiko Schocher <hs@denx.de>
[trini: Ensure we build arch/arm/imx-common on mx28]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/display_options.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/display_options.c b/lib/display_options.c index 57fb9741da..df134cd23a 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,9 +128,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) |
