projects
/
oweals
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
bb1bb4b
)
Merge tag 'video-for-2020.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot...
author
Tom Rini
<trini@konsulko.com>
Fri, 1 Nov 2019 13:35:37 +0000
(09:35 -0400)
committer
Tom Rini
<trini@konsulko.com>
Fri, 1 Nov 2019 13:35:37 +0000
(09:35 -0400)
- fix splash build breakage with newer llvm-7
common/splash.c
patch
|
blob
|
history
diff --git
a/common/splash.c
b/common/splash.c
index 0bcedbb0bad9804e957916c6825c56f344504741..e7d847726d0bb1d5df9470be3f48ba22c86ee6d4 100644
(file)
--- 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;
}