[PATCH 0/6] video: remove VIDCONSOLE_AS_LCD and VIDCONSOLE_AS_NAME
I propose this serie to remove the vidconsole work-around, activated with the 2 options VIDCONSOLE_AS_LCD and VIDCONSOLE_AS_NAME and cleanup the associated code in console.c (under #ifdef CONFIG_VIDCONSOLE_AS_LCD)
This options are now obsolete and they was planned to be removed around the end of 2020.
I propose this patchset for v2021.04 even if I don't test this serie on real boards.
Patrick.
Patrick Delaunay (6): tbs2910: configs: remove VIDCONSOLE_AS_LCD peach-pit: configs: remove VIDCONSOLE_AS_LCD snow: configs: remove VIDCONSOLE_AS_LCD peach-pi: configs: remove VIDCONSOLE_AS_LCD spring: configs: remove VIDCONSOLE_AS_LCD video: remove VIDCONSOLE_AS_LCD and VIDCONSOLE_AS_NAME
common/console.c | 10 ---------- configs/peach-pi_defconfig | 1 - configs/peach-pit_defconfig | 1 - configs/snow_defconfig | 1 - configs/spring_defconfig | 1 - configs/tbs2910_defconfig | 1 - drivers/video/Kconfig | 22 ---------------------- 7 files changed, 37 deletions(-)
Remove the obsolete CONFIG_VIDCONSOLE_AS_LCD as vidconsole is used in ./include/configs/tbs2910.h since commit 513acd04452f ("tbs2910: migrate to DM_VIDEO").
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---
configs/tbs2910_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index e43fab208d..b5580abbfd 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -103,7 +103,6 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_ANSI is not set CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_BMP_RLE8=y
On 03.12.20 10:15, Patrick Delaunay wrote:
Remove the obsolete CONFIG_VIDCONSOLE_AS_LCD as vidconsole is used in ./include/configs/tbs2910.h since commit 513acd04452f ("tbs2910: migrate to DM_VIDEO").
I don't consider this workaround as obsolete, please see my response to the cover letter of this series. [1]
So please do not remove this code.
Thanks, Soeren
[1] https://lists.denx.de/pipermail/u-boot/2020-December/434239.html
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com
configs/tbs2910_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index e43fab208d..b5580abbfd 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -103,7 +103,6 @@ CONFIG_DM_VIDEO=y # CONFIG_VIDEO_ANSI is not set CONFIG_SYS_WHITE_ON_BLACK=y # CONFIG_PANEL is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_VIDEO_BMP_RLE8=y
Remove the obsolete CONFIG_VIDCONSOLE_AS_LCD as vidconsole is used in ./include/configs/peach-pit.h => configs/exynos5-dt-common.h since the commit bb5930d5c97f ("exynos: video: Convert several boards to driver model for video")
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---
configs/peach-pit_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index c6646dcd6e..4d8da7307d 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -74,7 +74,6 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_HOST_ETHER=y CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
Remove the obsolete CONFIG_VIDCONSOLE_AS_LCD as vidconsole is used in ./include/configs/snow.h => configs/exynos5-dt-common.h since the commit bb5930d5c97f ("exynos: video: Convert several boards to driver model for video")
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---
configs/snow_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 76215034ac..0f31d7f963 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -85,7 +85,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
Remove the obsolete CONFIG_VIDCONSOLE_AS_LCD as vidconsole is used in ./include/configs/peach-pi.h => configs/exynos5-dt-common.h since the commit bb5930d5c97f ("exynos: video: Convert several boards to driver model for video")
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---
configs/peach-pi_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 01054b0ee4..0625305bd7 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -75,7 +75,6 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_HOST_ETHER=y CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
Remove the obsolete CONFIG_VIDCONSOLE_AS_LCD as vidconsole is used in ./include/configs/spring.h => configs/exynos5-dt-common.h since the commit bb5930d5c97f ("exynos: video: Convert several boards to driver model for video")
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com ---
configs/spring_defconfig | 1 - 1 file changed, 1 deletion(-)
diff --git a/configs/spring_defconfig b/configs/spring_defconfig index a1fdf1d1f6..eaf3a9fe1c 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -86,7 +86,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_DM_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_BRIDGE=y CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
On Thu, 3 Dec 2020 at 02:16, Patrick Delaunay patrick.delaunay@st.com wrote:
Remove the obsolete CONFIG_VIDCONSOLE_AS_LCD as vidconsole is used in ./include/configs/spring.h => configs/exynos5-dt-common.h since the commit bb5930d5c97f ("exynos: video: Convert several boards to driver model for video")
Signed-off-by: Patrick Delaunay patrick.delaunay@st.com
configs/spring_defconfig | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
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 --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
On 03.12.20 10:15, Patrick Delaunay wrote:
I propose this serie to remove the vidconsole work-around, activated with the 2 options VIDCONSOLE_AS_LCD and VIDCONSOLE_AS_NAME and cleanup the associated code in console.c (under #ifdef CONFIG_VIDCONSOLE_AS_LCD)
This options are now obsolete and they was planned to be removed around the end of 2020.
I propose this patchset for v2021.04 even if I don't test this serie on real boards.
I really would like to keep this code for now.
On the tbs2910 board this workaround was introduced in the last u-boot release (v2020.10), so there was almost no time for end users to notice the warning and to update there environment. Not every end user installs every new u-boot release, so we really should give more time for this change.
This workaround is self-contained, small, easy to maintain, and strictly opt-in. So this workaround hurts nobody, but removing this will let users alone without any HDMI output. So on this board (without included serial console port), this will result in unhappy users, especially since without any console output there is no chance to get any idea what is going wrong.
Thanks, Soeren
Patrick.
Patrick Delaunay (6): tbs2910: configs: remove VIDCONSOLE_AS_LCD peach-pit: configs: remove VIDCONSOLE_AS_LCD snow: configs: remove VIDCONSOLE_AS_LCD peach-pi: configs: remove VIDCONSOLE_AS_LCD spring: configs: remove VIDCONSOLE_AS_LCD video: remove VIDCONSOLE_AS_LCD and VIDCONSOLE_AS_NAME
common/console.c | 10 ---------- configs/peach-pi_defconfig | 1 - configs/peach-pit_defconfig | 1 - configs/snow_defconfig | 1 - configs/spring_defconfig | 1 - configs/tbs2910_defconfig | 1 - drivers/video/Kconfig | 22 ---------------------- 7 files changed, 37 deletions(-)
participants (3)
-
Patrick Delaunay -
Simon Glass -
Soeren Moch