projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'u-boot-imx-20190612' of git://git.denx.de/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
colibri_imx7.h
diff --git
a/include/configs/colibri_imx7.h
b/include/configs/colibri_imx7.h
index
3e4f63e
..
545f506
100644
(file)
--- a/
include/configs/colibri_imx7.h
+++ b/
include/configs/colibri_imx7.h
@@
-234,7
+234,7
@@
#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
#define DFU_DEFAULT_POLL_TIMEOUT 300
-#if
def CONFIG_VIDEO
+#if
defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)
#define CONFIG_VIDEO_MXS
#define CONFIG_VIDEO_LOGO
#define CONFIG_SPLASH_SCREEN