mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-16 18:04:48 +00:00
common: console: Delete obsolete VIDCONSOLE_AS_{LCD, NAME} options
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. Signed-off-by: Dragan Simic <dsimic@manjaro.org> Acked-by: Soeren Moch <smoch@web.de> # tbs2910
This commit is contained in:
parent
ef254ccf37
commit
f853295a6a
7 changed files with 0 additions and 37 deletions
|
@ -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++)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -98,7 +98,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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue