aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorSimon Glass2022-10-18 07:46:31 -0600
committerAnatolij Gustschin2022-10-30 20:07:17 +0100
commitb86986c7b314f1378ca5be8df49310a6ce7302f8 (patch)
tree11f72c50e524ae5b37e934e9a5d0558c00c6ee97 /cmd
parent9330abfb4a00512213d34147b78d2041fd467c6e (diff)
video: Rename CONFIG_DM_VIDEO to CONFIG_VIDEO
Now that all the old code is gone, rename this option. Driver model migration is now complete. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/Kconfig4
-rw-r--r--cmd/bdinfo.c2
-rw-r--r--cmd/cls.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 9aac5344162..3f6bc70d43a 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1877,7 +1877,7 @@ menu "Misc commands"
config CMD_BMP
bool "Enable 'bmp' command"
- depends on DM_VIDEO
+ depends on VIDEO
help
This provides a way to obtain information about a BMP-format image
and to display it. BMP (which presumably stands for BitMaP) is a
@@ -2163,7 +2163,7 @@ config CMD_UUID
config CMD_VIDCONSOLE
bool "lcdputs and setcurs"
- depends on DM_VIDEO
+ depends on VIDEO
default y
help
Enabling this will provide 'setcurs' and 'lcdputs' commands which
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index c454e6eee18..bf002f84475 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -122,7 +122,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
bdinfo_print_num_l("fdt_blob", (ulong)gd->fdt_blob);
bdinfo_print_num_l("new_fdt", (ulong)gd->new_fdt);
bdinfo_print_num_l("fdt_size", (ulong)gd->fdt_size);
- if (IS_ENABLED(CONFIG_DM_VIDEO))
+ if (IS_ENABLED(CONFIG_VIDEO))
show_video_info();
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
bdinfo_print_num_l("multi_dtb_fit", (ulong)gd->multi_dtb_fit);
diff --git a/cmd/cls.c b/cmd/cls.c
index ba36220d9e1..18643ec0243 100644
--- a/cmd/cls.c
+++ b/cmd/cls.c
@@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc,
/* Send clear screen and home */
printf(CSI "2J" CSI "1;1H");
- if (CONFIG_IS_ENABLED(DM_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
+ if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) {
if (uclass_first_device_err(UCLASS_VIDEO, &dev))
return CMD_RET_FAILURE;
if (video_clear(dev))