The configuration options CONFIG_VIDCONSOLE_AS_LCD and CONFIG_VIDCONSOLE_AS_ NAME have been marked as obsolete and scheduled for deletion in late 2020.
That's already long overdue and the last remaining consumers of these options have already migrated to using "vidconsole" in their "stdout" and "stderr" environment variables, so let's delete these two configuration options. Cc: Anatolij Gustschin <[email protected]> Cc: Jaehoon Chung <[email protected]> Cc: Simon Glass <[email protected]> Cc: Soeren Moch <[email protected]> Cc: Tom Rini <[email protected]> Signed-off-by: Dragan Simic <[email protected]> --- common/console.c | 11 ----------- 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 | 21 --------------------- 7 files changed, 37 deletions(-) diff --git a/common/console.c b/common/console.c index 863ac6aa9dc4..26812b2ccbef 100644 --- a/common/console.c +++ b/common/console.c @@ -942,11 +942,6 @@ struct stdio_dev *console_search_dev(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; @@ -1154,12 +1149,6 @@ done: if (!IS_ENABLED(CONFIG_SYS_CONSOLE_INFO_QUIET)) stdio_print_current_devices(); -#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 - if (IS_ENABLED(CONFIG_SYS_CONSOLE_ENV_OVERWRITE)) { /* set the environment variables (will overwrite previous env settings) */ for (i = 0; i < MAX_FILES; i++) diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig index 594af5136e36..247df4c9036a 100644 --- a/configs/peach-pi_defconfig +++ b/configs/peach-pi_defconfig @@ -81,7 +81,6 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_HOST_ETHER=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_EXYNOS=y CONFIG_EXYNOS_DP=y diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 2b34c25556a5..df72be8047b5 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -80,7 +80,6 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_HOST_ETHER=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_EXYNOS=y CONFIG_EXYNOS_DP=y diff --git a/configs/snow_defconfig b/configs/snow_defconfig index 7a1dc80b1cc0..977e3298046a 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -96,7 +96,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_EXYNOS=y CONFIG_EXYNOS_DP=y diff --git a/configs/spring_defconfig b/configs/spring_defconfig index 43846e3cad9e..d3b6656d6312 100644 --- a/configs/spring_defconfig +++ b/configs/spring_defconfig @@ -92,7 +92,6 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX88179=y CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -CONFIG_VIDCONSOLE_AS_LCD=y CONFIG_DISPLAY=y CONFIG_VIDEO_EXYNOS=y CONFIG_EXYNOS_DP=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 99fe65d31098..c307d8c23d0d 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -110,7 +110,6 @@ CONFIG_VIDEO=y # CONFIG_VIDEO_BPP32 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_IMX_VIDEO_SKIP=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3c3cebaacd02..5fcbbd41e4a9 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -293,27 +293,6 @@ config PANEL_HX8238D source "drivers/video/fonts/Kconfig" -config VIDCONSOLE_AS_LCD - bool "Use 'vidconsole' when CONFIG_VIDCONSOLE_AS_NAME string is seen in stdout" - 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_BOCHS bool "Enable Bochs video emulation for QEMU" help
