diff options
| author | Anatolij Gustschin <agust@denx.de> | 2019-10-30 15:04:10 +0100 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2019-10-31 09:10:34 +0100 |
| commit | 2ad8494c0fd7279aa9a7f73aff3fc38895e77711 (patch) | |
| tree | 7037ffe5f09867a6289547d6f7b66d71a337bd88 | |
| parent | 412326d1bc2d346d7b4faad6fa547eaf065681a2 (diff) | |
| download | u-boot-2ad8494c0fd7279aa9a7f73aff3fc38895e77711.tar.gz | |
splash: fix build breakage with newer llvm-7
Some configurations (i.e. sandbox) result in unused
splash_display_banner() and we get build errors like:
common/splash.c:148:20: error: unused function 'splash_display_banner' [-Werror,-Wunused-function]
static inline void splash_display_banner(void) { }
Drop empty inline function and add guards around the call.
Fixes: d2a8271c8851 ("splash: fix splash banner output")
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Reported-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | common/splash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/splash.c b/common/splash.c index 0bcedbb0ba..e7d847726d 100644 --- a/common/splash.c +++ b/common/splash.c @@ -144,8 +144,6 @@ void splash_display_banner(void) vidconsole_put_string(dev, buf); vidconsole_position_cursor(dev, 0, row); } -#else -static inline void splash_display_banner(void) { } #endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */ /* @@ -177,7 +175,9 @@ int splash_display(void) if (x || y) goto end; +#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION) splash_display_banner(); +#endif end: return ret; } |