Skip to content

Commit 0f9b86f

Browse files
sjg20vdsao
authored andcommitted
video: Drop remaining references to CONFIG_LCD
These rely on the old LCD implementation which is to be removed. Drop it all. Signed-off-by: Simon Glass <[email protected]>
1 parent 777f3e3 commit 0f9b86f

File tree

5 files changed

+3
-54
lines changed

5 files changed

+3
-54
lines changed

README

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -770,51 +770,6 @@ The following options need to be configured:
770770
- Keyboard Support:
771771
See Kconfig help for available keyboard drivers.
772772

773-
- LCD Support: CONFIG_LCD
774-
775-
Define this to enable LCD support (for output to LCD
776-
display); also select one of the supported displays
777-
by defining one of these:
778-
779-
CONFIG_NEC_NL6448AC33:
780-
781-
NEC NL6448AC33-18. Active, color, single scan.
782-
783-
CONFIG_NEC_NL6448BC20
784-
785-
NEC NL6448BC20-08. 6.5", 640x480.
786-
Active, color, single scan.
787-
788-
CONFIG_NEC_NL6448BC33_54
789-
790-
NEC NL6448BC33-54. 10.4", 640x480.
791-
Active, color, single scan.
792-
793-
CONFIG_SHARP_16x9
794-
795-
Sharp 320x240. Active, color, single scan.
796-
It isn't 16x9, and I am not sure what it is.
797-
798-
CONFIG_SHARP_LQ64D341
799-
800-
Sharp LQ64D341 display, 640x480.
801-
Active, color, single scan.
802-
803-
CONFIG_HLD1045
804-
805-
HLD1045 display, 640x480.
806-
Active, color, single scan.
807-
808-
CONFIG_OPTREX_BW
809-
810-
Optrex CBL50840-2 NF-FW 99 22 M5
811-
or
812-
Hitachi LMG6912RPFC-00T
813-
or
814-
Hitachi SP14Q002
815-
816-
320x240. Black & white.
817-
818773
- MII/PHY support:
819774
CONFIG_PHY_CLOCK_FREQ (ppc4xx)
820775

cmd/bdinfo.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
124124
bdinfo_print_num_l("fdt_size", (ulong)gd->fdt_size);
125125
if (IS_ENABLED(CONFIG_DM_VIDEO))
126126
show_video_info();
127-
#if defined(CONFIG_LCD)
128-
bdinfo_print_num_l("FB base ", gd->fb_base);
129-
#endif
130127
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
131128
bdinfo_print_num_l("multi_dtb_fit", (ulong)gd->multi_dtb_fit);
132129
#endif

common/stdio.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,6 @@ int stdio_add_devices(void)
366366
if (IS_ENABLED(CONFIG_SPLASH_SCREEN) &&
367367
IS_ENABLED(CONFIG_CMD_BMP))
368368
splash_display();
369-
} else {
370-
if (IS_ENABLED(CONFIG_LCD))
371-
drv_lcd_init();
372369
}
373370

374371
drv_system_init();

doc/usage/environment.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ For example, for snapper9260 you would create a text file called
6363
Example::
6464

6565
stdout=serial
66-
#ifdef CONFIG_LCD
67-
stdout+=,lcd
66+
#ifdef CONFIG_DM_VIDEO
67+
stdout+=,vidconsole
6868
#endif
6969
bootcmd=
7070
/* U-Boot script for booting */

include/asm-generic/global_data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct global_data {
6868
* @mem_clk: memory clock rate in Hz
6969
*/
7070
unsigned long mem_clk;
71-
#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO)
71+
#if defined(CONFIG_DM_VIDEO)
7272
/**
7373
* @fb_base: base address of frame buffer memory
7474
*/

0 commit comments

Comments
 (0)