aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini2019-11-01 09:35:37 -0400
committerTom Rini2019-11-01 09:35:37 -0400
commitbafed105426ddb6003157bad9c522e6fcca60033 (patch)
tree328cca02227ecdf713b9f6a53f43a53271599454
parentbb1bb4bb5df9df4d3f07e39a632daaff79e4b77e (diff)
parent2ad8494c0fd7279aa9a7f73aff3fc38895e77711 (diff)
Merge tag 'video-for-2020.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- fix splash build breakage with newer llvm-7
-rw-r--r--common/splash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/splash.c b/common/splash.c
index 0bcedbb0bad..e7d847726d0 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;
}