diff options
| author | Simon Glass <sjg@chromium.org> | 2022-01-23 07:04:08 -0700 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2022-03-28 20:17:07 +0200 |
| commit | 1fa43cad862591fe8917a0c1fe2f21f062c7502b (patch) | |
| tree | a17f830e6243917cd145007b1bee7bf0291ea0e7 /cmd | |
| parent | 82975f8a9ec290b4cf2f9a228dd78761b35565ea (diff) | |
| download | u-boot-1fa43cad862591fe8917a0c1fe2f21f062c7502b.zip u-boot-1fa43cad862591fe8917a0c1fe2f21f062c7502b.tar.gz u-boot-1fa43cad862591fe8917a0c1fe2f21f062c7502b.tar.bz2 | |
video: Drop references to CONFIG_VIDEO et al
Drop the Kconfigs which are not used and all references to them. In
particular, this drops CONFIG_VIDEO to avoid confusion and allow us to
eventually rename CONFIG_DM_VIDEO to CONFIG_VIDEO.
Also drop the prototype for video_get_info_str() which is no-longer used.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Jason Liu <jason.hui.liu@nxp.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/bdinfo.c | 2 | ||||
| -rw-r--r-- | cmd/bmp.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 25c9fde..1d84012 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 c56b3f4..37cd8a5 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) @@ -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) |