diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-18 07:46:31 -0600 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2022-10-30 20:07:17 +0100 |
| commit | b86986c7b314f1378ca5be8df49310a6ce7302f8 (patch) | |
| tree | 11f72c50e524ae5b37e934e9a5d0558c00c6ee97 /lib | |
| parent | 9330abfb4a00512213d34147b78d2041fd467c6e (diff) | |
| download | u-boot-b86986c7b314f1378ca5be8df49310a6ce7302f8.zip u-boot-b86986c7b314f1378ca5be8df49310a6ce7302f8.tar.gz u-boot-b86986c7b314f1378ca5be8df49310a6ce7302f8.tar.bz2 | |
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 'lib')
| -rw-r--r-- | lib/efi_loader/Makefile | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_console.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index e187d2a..f8e8afe 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -66,7 +66,7 @@ obj-$(CONFIG_EFI_VARIABLES_PRESEED) += efi_var_seed.o endif obj-y += efi_watchdog.o obj-$(CONFIG_EFI_ESRT) += efi_esrt.o -obj-$(CONFIG_DM_VIDEO) += efi_gop.o +obj-$(CONFIG_VIDEO) += efi_gop.o obj-$(CONFIG_BLK) += efi_disk.o obj-$(CONFIG_NET) += efi_net.o obj-$(CONFIG_GENERATE_ACPI_TABLE) += efi_acpi.o diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index ab83f8b..4d08dd3 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -353,7 +353,7 @@ void efi_setup_console_size(void) int rows = 25, cols = 80; int ret = -ENODEV; - if (IS_ENABLED(CONFIG_DM_VIDEO)) + if (IS_ENABLED(CONFIG_VIDEO)) ret = query_vidconsole(&rows, &cols); if (ret) ret = query_console_serial(&rows, &cols); diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index 0b7372e..a340bc3 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -326,7 +326,7 @@ efi_status_t efi_init_obj_list(void) goto out; } - if (IS_ENABLED(CONFIG_DM_VIDEO)) { + if (IS_ENABLED(CONFIG_VIDEO)) { ret = efi_gop_register(); if (ret != EFI_SUCCESS) goto out; |