public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/2] dm: video: Add a temporary work-around for old stdout var
@ 2016-02-06 21:31 Simon Glass
  2016-02-06 21:31 ` [U-Boot] [PATCH 2/2] video: tegra: Enable the 'lcd' env variable work-around Simon Glass
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Simon Glass @ 2016-02-06 21:31 UTC (permalink / raw)
  To: u-boot

Boards with a saved environment may use 'lcd' in their stdout environment
variable, expecting that this will enable output to the LCD. When the board
moves to use driver model for video, this will no-longer work. Add a
work-around to fix this. A warning messages is printed, and we will remove
the work-around at the end of 2016.

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

 common/console.c      |  8 ++++++++
 drivers/video/Kconfig | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/common/console.c b/common/console.c
index b3f5fdc..6a0d11b 100644
--- a/common/console.c
+++ b/common/console.c
@@ -650,6 +650,10 @@ 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, "lcd"))
+		dev = stdio_get_by_name("vidconsole");
+#endif
 
 	if (dev && (dev->flags & flags))
 		return dev;
@@ -795,6 +799,10 @@ 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, "lcd"))
+		printf("Warning: Please change 'lcd' to 'vidconsole' in stdout/stderr environment vars\n");
+#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 981ba8b..ae6c244 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -57,6 +57,16 @@ config VIDEO_ROTATION
 	  struct video_priv: 0=unrotated, 1=90 degrees clockwise, 2=180
 	  degrees, 3=270 degrees.
 
+config VIDCONSOLE_AS_LCD
+	bool "Use 'vidconsole' when 'lcd' is seen in stdout"
+	depends on DM_VIDEO
+	help
+	  This is a work-around for boards which have 'lcd' 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 2016.
+
 config VIDEO_VESA
 	bool "Enable VESA video driver support"
 	default n
-- 
2.7.0.rc3.207.g0ac5344

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-02-11 20:40 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-06 21:31 [U-Boot] [PATCH 1/2] dm: video: Add a temporary work-around for old stdout var Simon Glass
2016-02-06 21:31 ` [U-Boot] [PATCH 2/2] video: tegra: Enable the 'lcd' env variable work-around Simon Glass
2016-02-06 22:23   ` Anatolij Gustschin
2016-02-11 20:40   ` Anatolij Gustschin
2016-02-06 22:23 ` [U-Boot] [PATCH 1/2] dm: video: Add a temporary work-around for old stdout var Anatolij Gustschin
2016-02-08 21:09 ` Stephen Warren
2016-02-11 20:28   ` Simon Glass
2016-02-11 20:38 ` Anatolij Gustschin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox