diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-28 19:28:31 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-28 19:28:31 +0300 |
| commit | 87a9aa604de8a4a50642e25b88af328ab375893b (patch) | |
| tree | 863b4beef53827cddf2813dd7627aaa0bac62cda /common/splash.c | |
| parent | 111a8b57354bb5aff55635502a0cdf74cb63e835 (diff) | |
| parent | 92302ab1a279859824ec0f2e3864be44e883bff9 (diff) | |
| download | u-boot-87a9aa604de8a4a50642e25b88af328ab375893b.tar.xz | |
Merge tag 'video-next-20211228' of https://source.denx.de/u-boot/custodians/u-boot-video into next
- various fixes to the sandbox display support
- support for showing a logo without splash screen config
- support for BMP drawing to depths other than 16bpp
- tests for the different types of supported BMP images
- support showing a logo when running coreboot via qemu
Diffstat (limited to 'common/splash.c')
| -rw-r--r-- | common/splash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/splash.c b/common/splash.c index de720df9f5..98f0089266 100644 --- a/common/splash.c +++ b/common/splash.c @@ -52,7 +52,7 @@ static struct splash_location default_splash_locations[] = { }, }; -#if defined(CONFIG_DM_VIDEO) && defined(CONFIG_VIDEO_LOGO) +#ifdef CONFIG_VIDEO_LOGO #include <bmp_logo_data.h> |