commit 52cb5044aef7e4fa5a0de0f7dfd6b3d319f83ae0
author Simon Glass <sjg@chromium.org> Tue Oct 18 07:46:31 2022 -0600
committer Anatolij Gustschin <agust@denx.de> Sun Oct 30 20:07:17 2022 +0100
tree 11f72c50e524ae5b37e934e9a5d0558c00c6ee97
parent 04c640c109945c929a71dd3daf04789ca2115461

video: Rename CONFIG_DM_VIDEO to CONFIG_VIDEO

Now that all the old code is gone, rename this option. Driver model
migration is now complete.

Signed-off-by: Simon Glass <sjg@chromium.org>

common/Kconfig

diff --git a/common/Kconfig b/common/Kconfig
index 6608a4f..62e7fb5 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -194,7 +194,7 @@
 
 config CONSOLE_MUX
 	bool "Enable console multiplexing"
-	default y if DM_VIDEO || VIDEO || LCD
+	default y if VIDEO || VIDEO || LCD
 	help
 	  This allows multiple devices to be used for each console 'file'.
 	  For example, stdout can be set to go to serial and video.

common/board_f.c

diff --git a/common/board_f.c b/common/board_f.c
index 0f7354d..51ba593 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -408,7 +408,7 @@
 
 static int reserve_video(void)
 {
-	if (IS_ENABLED(CONFIG_DM_VIDEO)) {
+	if (IS_ENABLED(CONFIG_VIDEO)) {
 		ulong addr;
 		int ret;
 

common/fdt_simplefb.c

diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c
index 9519564..71d4c8f 100644
--- a/common/fdt_simplefb.c
+++ b/common/fdt_simplefb.c
@@ -82,7 +82,7 @@
 	return fdt_simplefb_configure_node(blob, off);
 }
 
-#if CONFIG_IS_ENABLED(DM_VIDEO)
+#if CONFIG_IS_ENABLED(VIDEO)
 int fdt_simplefb_enable_and_mem_rsv(void *blob)
 {
 	struct fdt_memory mem;

common/splash.c

diff --git a/common/splash.c b/common/splash.c
index 8a55dd3..2e466a8 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -119,7 +119,7 @@
 }
 #endif /* CONFIG_SPLASH_SCREEN_ALIGN */
 
-#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
+#if defined(CONFIG_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
 
 #ifdef CONFIG_VIDEO_LOGO
 #include <bmp_logo.h>
@@ -151,7 +151,7 @@
 	vidconsole_put_string(dev, buf);
 	vidconsole_position_cursor(dev, 0, row);
 }
-#endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
+#endif /* CONFIG_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
 
 /*
  * Common function to show a splash image if env("splashimage") is set.
@@ -181,7 +181,7 @@
 	if (x || y)
 		goto end;
 
-#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
+#if defined(CONFIG_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
 	splash_display_banner();
 #endif
 end:

common/stdio.c

diff --git a/common/stdio.c b/common/stdio.c
index 49784e3..cbedfdd 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -200,7 +200,7 @@
 		if (strcmp(sdev->name, name) == 0)
 			return sdev;
 	}
-	if (IS_ENABLED(CONFIG_DM_VIDEO)) {
+	if (IS_ENABLED(CONFIG_VIDEO)) {
 		/*
 		 * We did not find a suitable stdio device. If there is a video
 		 * driver with a name starting with 'vidconsole', we can try
@@ -340,7 +340,7 @@
 #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
 	i2c_init_all();
 #endif
-	if (IS_ENABLED(CONFIG_DM_VIDEO)) {
+	if (IS_ENABLED(CONFIG_VIDEO)) {
 		/*
 		 * If the console setting is not in environment variables then
 		 * console_init_r() will not be calling iomux_doenv() (which