From: Anatolij Gustschin <agust@denx.de>
Date: Mon, 18 Mar 2019 22:29:44 +0000 (+0100)
Subject: imx6: wandboard: convert to DM_VIDEO
X-Git-Tag: v2019.07-rc1~21^2~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f99cd5a787208227e665a76002322a17fad2f1b2;p=oweals%2Fu-boot.git

imx6: wandboard: convert to DM_VIDEO

Enable DM_VIDEO in defconfig.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---

diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 9e13d7f67c..c4018cce4a 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -47,6 +47,6 @@ CONFIG_PINCTRL_IMX6=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
-CONFIG_VIDEO=y
+CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_IPUV3=y
 # CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index e01e3e3669..13a9fd2450 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -63,7 +63,6 @@
 #define CONFIG_PHY_ATHEROS
 
 /* Framebuffer */
-#ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -72,7 +71,6 @@
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#endif
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"console=ttymxc0\0" \