diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-29 09:02:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-29 09:02:46 -0400 |
| commit | ad4a699cfe36639979d27a1045d766397b2cb0bb (patch) | |
| tree | 9bc67763b8d48d950ae08d29ec75605138ba0b4d /include/configs | |
| parent | c957be9ba006789c7ca1158120ed40265bfeed8a (diff) | |
| parent | 970baf16d1322d3930a57fc78ddfb15d594d690c (diff) | |
| download | u-boot-ad4a699cfe36639979d27a1045d766397b2cb0bb.tar.gz | |
Merge tag 'video-for-2019.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- dcu and imx7 DM_VIDEO conversion
- lb070wv8 compatible in simple_panel driver
- bmp_logo improvements for DM_VIDEO
- EDID updates to filter supported modes
- meson_dw_hdmi: support EDID mode filtering
- dw_hdmi: support ddc-i2c-bus phandle for external I2C masters
- fix rpi crash when firmware doesn't report connected display
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 2c43862800..05af222a1f 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -170,7 +170,7 @@ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M #define DFU_DEFAULT_POLL_TIMEOUT 300 -#ifdef CONFIG_VIDEO +#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #define CONFIG_VIDEO_LOGO |