diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-09 17:47:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-09 17:47:27 -0400 |
| commit | f331497d3ad4166f9826e7674793ae04094b29c1 (patch) | |
| tree | 09c8df48a0b48eee7780e7594ddc33fc2c8f59d4 /include/configs/colibri-imx6ull.h | |
| parent | 2a2d8e94ddc75c2c8d456e9163aa5dac510badcf (diff) | |
| parent | 79c05335a9c101f0b54f2f378d0b08c9b765e1a3 (diff) | |
| download | u-boot-WIP/09Oct2021.zip u-boot-WIP/09Oct2021.tar.gz u-boot-WIP/09Oct2021.tar.bz2 | |
Merge tag 'video-20211009' of https://source.denx.de/u-boot/custodians/u-boot-videoWIP/09Oct2021
- 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-imx6ull.h')
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index a2f2de7..741c3fe 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -134,8 +134,7 @@ /* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300 -#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) -#define CONFIG_VIDEO_MXS +#if defined(CONFIG_DM_VIDEO) #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define CONFIG_VIDEO_LOGO #define CONFIG_VIDEO_BMP_LOGO |