diff options
| author | Tom Rini <[email protected]> | 2022-03-28 17:04:45 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-03-28 17:04:45 -0400 |
| commit | d2e5250be49fce4653689c41a5dc7e2d7e7ecf33 (patch) | |
| tree | 47a7fd743dc2266a71b23c46c2a6d7e12e4a5833 /cmd | |
| parent | 34d2b7f20369d62c0f091d6572a8c0ea4655cf14 (diff) | |
| parent | 60cc4094485bf44b5ad455b51076f0e07f3f793a (diff) | |
Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video into next
- drop old CFB code
- drop CONFIG_LCD_BMP_RLE8
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/bdinfo.c | 2 | ||||
| -rw-r--r-- | cmd/bmp.c | 4 | ||||
| -rw-r--r-- | cmd/cls.c | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 25c9fde4a7b..1d8401236fb 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1786,7 +1786,7 @@ config CMD_CONITRACE config CMD_CLS bool "Enable clear screen command 'cls'" - depends on CFB_CONSOLE || DM_VIDEO || LCD || VIDEO + depends on DM_VIDEO || LCD || VIDEO default y if LCD help Enable the 'cls' command which clears the screen contents diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index c56b3f4f6ec..37cd8a57ebd 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -117,7 +117,7 @@ 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) || defined(CONFIG_VIDEO) +#if defined(CONFIG_LCD) bdinfo_print_num_l("FB base ", gd->fb_base); #endif #if CONFIG_IS_ENABLED(MULTI_DTB_FIT) diff --git a/cmd/bmp.c b/cmd/bmp.c index 071ba90b435..45f4c1296de 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -268,10 +268,8 @@ int bmp_display(ulong addr, int x, int y) } #elif defined(CONFIG_LCD) ret = lcd_display_bitmap(addr, x, y); -#elif defined(CONFIG_VIDEO) - ret = video_display_bitmap(addr, x, y); #else -# error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO +# error bmp_display() requires CONFIG_LCD #endif if (bmp_alloc_addr) diff --git a/cmd/cls.c b/cmd/cls.c index bdeb49786d4..502d5ed697a 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -28,8 +28,6 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, if (video_clear(dev)) return CMD_RET_FAILURE; #endif -#elif defined(CONFIG_CFB_CONSOLE) - video_clear(); #elif defined(CONFIG_LCD) lcd_clear(); #else |