[PATCH 28/39] video: Drop remaining references to CONFIG_LCD
Simon Glass
sjg at chromium.org
Wed Oct 19 13:23:45 CEST 2022
These rely on the old LCD implementation which is to be removed. Drop it
all.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
README | 45 -------------------------------
cmd/bdinfo.c | 3 ---
common/stdio.c | 3 ---
doc/usage/environment.rst | 4 +--
include/asm-generic/global_data.h | 2 +-
5 files changed, 3 insertions(+), 54 deletions(-)
diff --git a/README b/README
index d1d4a62947a..ec1b50c3055 100644
--- a/README
+++ b/README
@@ -770,51 +770,6 @@ The following options need to be configured:
- Keyboard Support:
See Kconfig help for available keyboard drivers.
-- LCD Support: CONFIG_LCD
-
- Define this to enable LCD support (for output to LCD
- display); also select one of the supported displays
- by defining one of these:
-
- CONFIG_NEC_NL6448AC33:
-
- NEC NL6448AC33-18. Active, color, single scan.
-
- CONFIG_NEC_NL6448BC20
-
- NEC NL6448BC20-08. 6.5", 640x480.
- Active, color, single scan.
-
- CONFIG_NEC_NL6448BC33_54
-
- NEC NL6448BC33-54. 10.4", 640x480.
- Active, color, single scan.
-
- CONFIG_SHARP_16x9
-
- Sharp 320x240. Active, color, single scan.
- It isn't 16x9, and I am not sure what it is.
-
- CONFIG_SHARP_LQ64D341
-
- Sharp LQ64D341 display, 640x480.
- Active, color, single scan.
-
- CONFIG_HLD1045
-
- HLD1045 display, 640x480.
- Active, color, single scan.
-
- CONFIG_OPTREX_BW
-
- Optrex CBL50840-2 NF-FW 99 22 M5
- or
- Hitachi LMG6912RPFC-00T
- or
- Hitachi SP14Q002
-
- 320x240. Black & white.
-
- MII/PHY support:
CONFIG_PHY_CLOCK_FREQ (ppc4xx)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index af2e9757db5..c454e6eee18 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -124,9 +124,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
bdinfo_print_num_l("fdt_size", (ulong)gd->fdt_size);
if (IS_ENABLED(CONFIG_DM_VIDEO))
show_video_info();
-#if defined(CONFIG_LCD)
- bdinfo_print_num_l("FB base ", gd->fb_base);
-#endif
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
bdinfo_print_num_l("multi_dtb_fit", (ulong)gd->multi_dtb_fit);
#endif
diff --git a/common/stdio.c b/common/stdio.c
index a6d8a4b674f..481a30486a7 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -366,9 +366,6 @@ int stdio_add_devices(void)
if (IS_ENABLED(CONFIG_SPLASH_SCREEN) &&
IS_ENABLED(CONFIG_CMD_BMP))
splash_display();
- } else {
- if (IS_ENABLED(CONFIG_LCD))
- drv_lcd_init();
}
#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst
index 7906ace2af6..d12bbcd85a2 100644
--- a/doc/usage/environment.rst
+++ b/doc/usage/environment.rst
@@ -63,8 +63,8 @@ For example, for snapper9260 you would create a text file called
Example::
stdout=serial
- #ifdef CONFIG_LCD
- stdout+=,lcd
+ #ifdef CONFIG_DM_VIDEO
+ stdout+=,vidconsole
#endif
bootcmd=
/* U-Boot script for booting */
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 2d55fe2ac0f..8ca93ac5269 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -68,7 +68,7 @@ struct global_data {
* @mem_clk: memory clock rate in Hz
*/
unsigned long mem_clk;
-#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
+#if defined(CONFIG_DM_VIDEO)
/**
* @fb_base: base address of frame buffer memory
*/
--
2.38.0.413.g74048e4d9e-goog
More information about the U-Boot
mailing list