diff options
| author | Tom Rini | 2021-12-28 11:28:31 -0500 |
|---|---|---|
| committer | Tom Rini | 2021-12-28 11:28:31 -0500 |
| commit | 87a9aa604de8a4a50642e25b88af328ab375893b (patch) | |
| tree | 863b4beef53827cddf2813dd7627aaa0bac62cda /include/configs/colibri_imx6.h | |
| parent | 111a8b57354bb5aff55635502a0cdf74cb63e835 (diff) | |
| parent | 92302ab1a279859824ec0f2e3864be44e883bff9 (diff) | |
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 'include/configs/colibri_imx6.h')
| -rw-r--r-- | include/configs/colibri_imx6.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 9a6f17f5bd2..c8e733bc366 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -35,7 +35,6 @@ #define CONFIG_USBD_HS /* Framebuffer and LCD */ -#define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP |