summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-06-10 09:41:19 -0400
committerTom Rini <trini@konsulko.com>2019-06-10 09:41:19 -0400
commit99e14d5249a1b46ec4a4321d6125449a8f09b549 (patch)
tree6e5e4d72c8dbb4a542782514410c59181e0b1752 /include/configs
parenteb53a18c9e903e35e8e8d52da96c33b63822881c (diff)
parentf944b15966d410fd81f6051a836f86d5263f617e (diff)
Merge tag 'video-updates-for-2019.07-rc3' of git://git.denx.de/u-boot-video
- mxsfb DM_VIDEO conversion - splash fix for DM_VIDEO configurations - meson HDMI fix for boards without hdmi-supply regulator
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/colibri_imx7.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 7dfc92c085..c3b353b2c2 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -225,7 +225,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 CONFIG_VIDEO_LOGO
#define CONFIG_SPLASH_SCREEN