diff mbox series

[6/6] video: remove VIDCONSOLE_AS_LCD and VIDCONSOLE_AS_NAME

Message ID 20201203101538.6.I6465bef9819233a1e02dcc0c8737d534275b85f6@changeid
State Deferred
Delegated to: Anatolij Gustschin
Headers show
Series video: remove VIDCONSOLE_AS_LCD and VIDCONSOLE_AS_NAME | expand

Commit Message

Patrick DELAUNAY Dec. 3, 2020, 9:15 a.m. UTC 
Remove as planned (option will be removed around the end of 2020)
the workaround for boards which have 'lcd' or 'vga' in their stdout
environment variable.

These options are no more used in any defconfig and this patch simplify
the code in console.c file.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
---

 common/console.c      | 10 ----------
 drivers/video/Kconfig | 22 ----------------------
 2 files changed, 32 deletions(-)
diff mbox series

Patch

diff --git a/common/console.c b/common/console.c
index 3348436da6..dce28723d5 100644
--- a/common/console.c
+++ b/common/console.c
@@ -730,11 +730,6 @@  struct stdio_dev *search_device(int flags, const char *name)
 	struct stdio_dev *dev;
 
 	dev = stdio_get_by_name(name);
-#ifdef CONFIG_VIDCONSOLE_AS_LCD
-	if (!dev && !strcmp(name, CONFIG_VIDCONSOLE_AS_NAME))
-		dev = stdio_get_by_name("vidconsole");
-#endif
-
 	if (dev && (dev->flags & flags))
 		return dev;
 
@@ -914,11 +909,6 @@  done:
 #ifndef CONFIG_SYS_CONSOLE_INFO_QUIET
 	stdio_print_current_devices();
 #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
-#ifdef CONFIG_VIDCONSOLE_AS_LCD
-	if (strstr(stdoutname, CONFIG_VIDCONSOLE_AS_NAME))
-		printf("Warning: Please change '%s' to 'vidconsole' in stdout/stderr environment vars\n",
-		       CONFIG_VIDCONSOLE_AS_NAME);
-#endif
 
 #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 	/* set the environment variables (will overwrite previous env settings) */
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 998271b9b6..e4bf04a561 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -207,28 +207,6 @@  config SIMPLE_PANEL
 
 source "drivers/video/fonts/Kconfig"
 
-config VIDCONSOLE_AS_LCD
-	bool "Use 'vidconsole' when CONFIG_VIDCONSOLE_AS_NAME string is seen in stdout"
-	depends on DM_VIDEO
-	help
-	  This is a work-around for boards which have 'lcd' or 'vga' in their
-	  stdout environment variable, but have moved to use driver model for
-	  video. In this case the console will no-longer work. While it is
-	  possible to update the environment, the breakage may be confusing for
-	  users. This option will be removed around the end of 2020.
-
-config VIDCONSOLE_AS_NAME
-	string "Use 'vidconsole' when string defined here is seen in stdout"
-	depends on VIDCONSOLE_AS_LCD
-	default "lcd" if LCD || TEGRA_COMMON
-	default "vga" if !LCD
-	help
-	  This is a work-around for boards which have 'lcd' or 'vga' in their
-	  stdout environment variable, but have moved to use driver model for
-	  video. In this case the console will no-longer work. While it is
-	  possible to update the environment, the breakage may be confusing for
-	  users. This option will be removed around the end of 2020.
-
 config VIDEO_COREBOOT
 	bool "Enable coreboot framebuffer driver support"
 	depends on X86 && SYS_COREBOOT