From 513acd04452f314b9c904b0d4dd0452fece07fd1 Mon Sep 17 00:00:00 2001
From: Anatolij Gustschin <agust@denx.de>
Date: Mon, 25 May 2020 13:12:51 +0200
Subject: [PATCH] tbs2910: migrate to DM_VIDEO

Migration to DM_VIDEO driver is long overdue, configure it in
board config files. To enable the display set stdout like:

  setenv stdout serial,vidconsole

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Tested-by: Soeren Moch <smoch@web.de>
---
 configs/tbs2910_defconfig |  9 ++++++++-
 include/configs/tbs2910.h | 10 ++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index fbd2293add..27080c75ef 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -91,8 +91,15 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_I2C_EDID=y
+CONFIG_DM_VIDEO=y
+# CONFIG_BACKLIGHT is not set
+# CONFIG_CMD_VIDCONSOLE is not set
+# CONFIG_VIDEO_BPP8 is not set
+# CONFIG_VIDEO_BPP32 is not set
+# CONFIG_VIDEO_ANSI is not set
+# CONFIG_PANEL is not set
 CONFIG_VIDEO_IPUV3=y
-CONFIG_VIDEO=y
+CONFIG_SYS_WHITE_ON_BLACK=y
 # CONFIG_GZIP is not set
 CONFIG_OF_LIBFDT_ASSUME_MASK=0xff
 # CONFIG_EFI_LOADER is not set
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index 17de122852..eb16eb3d8a 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -37,11 +37,9 @@
 #define CONFIG_MXC_UART_BASE		UART1_BASE /* select UART1/UART2 */
 
 /* Framebuffer */
-#ifdef CONFIG_VIDEO
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
-#endif
 
 /* PCI */
 #ifdef CONFIG_CMD_PCI
@@ -102,11 +100,11 @@
 	"scriptaddr=0x14000000\0" \
 	"set_con_serial=setenv stdout serial; " \
 			"setenv stderr serial\0" \
-	"set_con_hdmi=setenv stdout serial,vga; " \
-			"setenv stderr serial,vga\0" \
-	"stderr=serial,vga\0" \
+	"set_con_hdmi=setenv stdout serial,vidconsole; " \
+			"setenv stderr serial,vidconsole\0" \
+	"stderr=serial,vidconsole\0" \
 	"stdin=serial,usbkbd\0" \
-	"stdout=serial,vga\0"
+	"stdout=serial,vidconsole\0"
 
 /* Enable distro boot */
 #define BOOT_TARGET_DEVICES(func) \
-- 
2.39.5