diff options
author | Tom Rini <trini@konsulko.com> | 2021-10-10 00:47:27 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-10-10 00:47:27 +0300 |
commit | f331497d3ad4166f9826e7674793ae04094b29c1 (patch) | |
tree | 09c8df48a0b48eee7780e7594ddc33fc2c8f59d4 /include/configs/colibri_imx7.h | |
parent | 2a2d8e94ddc75c2c8d456e9163aa5dac510badcf (diff) | |
parent | 79c05335a9c101f0b54f2f378d0b08c9b765e1a3 (diff) | |
download | u-boot-f331497d3ad4166f9826e7674793ae04094b29c1.tar.xz |
Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-video
- add 30bpp support (EFI, simplefb, vidconsole)
- fix video console name in CONSOLE_MUX Kconfig help
- move mxsfb driver config option to Kconfig
- remove unused mx3fb driver
# gpg verification failed.
Diffstat (limited to 'include/configs/colibri_imx7.h')
-rw-r--r-- | include/configs/colibri_imx7.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 07c26e3d0b..344b266db9 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -200,8 +200,7 @@ #define CONFIG_USBD_HS -#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) -#define CONFIG_VIDEO_MXS +#if defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO #endif |