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 /common | |
| 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 'common')
| -rw-r--r-- | common/Kconfig | 2 | ||||
| -rw-r--r-- | common/board_f.c | 2 | ||||
| -rw-r--r-- | common/fdt_simplefb.c | 2 | ||||
| -rw-r--r-- | common/splash.c | 6 | ||||
| -rw-r--r-- | common/stdio.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/common/Kconfig b/common/Kconfig index 6608a4f..62e7fb5 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -194,7 +194,7 @@ config CONSOLE_FLUSH_SUPPORT config CONSOLE_MUX bool "Enable console multiplexing" - default y if DM_VIDEO || VIDEO || LCD + default y if VIDEO || VIDEO || LCD help This allows multiple devices to be used for each console 'file'. For example, stdout can be set to go to serial and video. diff --git a/common/board_f.c b/common/board_f.c index 0f7354d..51ba593 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -408,7 +408,7 @@ __weak int arch_reserve_mmu(void) static int reserve_video(void) { - if (IS_ENABLED(CONFIG_DM_VIDEO)) { + if (IS_ENABLED(CONFIG_VIDEO)) { ulong addr; int ret; diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c index 9519564..71d4c8f 100644 --- a/common/fdt_simplefb.c +++ b/common/fdt_simplefb.c @@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob) return fdt_simplefb_configure_node(blob, off); } -#if CONFIG_IS_ENABLED(DM_VIDEO) +#if CONFIG_IS_ENABLED(VIDEO) int fdt_simplefb_enable_and_mem_rsv(void *blob) { struct fdt_memory mem; diff --git a/common/splash.c b/common/splash.c index 8a55dd3..2e466a8 100644 --- a/common/splash.c +++ b/common/splash.c @@ -119,7 +119,7 @@ void splash_get_pos(int *x, int *y) } #endif /* CONFIG_SPLASH_SCREEN_ALIGN */ -#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION) +#if defined(CONFIG_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION) #ifdef CONFIG_VIDEO_LOGO #include <bmp_logo.h> @@ -151,7 +151,7 @@ void splash_display_banner(void) vidconsole_put_string(dev, buf); vidconsole_position_cursor(dev, 0, row); } -#endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */ +#endif /* CONFIG_VIDEO && !CONFIG_HIDE_LOGO_VERSION */ /* * Common function to show a splash image if env("splashimage") is set. @@ -181,7 +181,7 @@ int splash_display(void) if (x || y) goto end; -#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION) +#if defined(CONFIG_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION) splash_display_banner(); #endif end: diff --git a/common/stdio.c b/common/stdio.c index 49784e3..cbedfdd 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -200,7 +200,7 @@ struct stdio_dev *stdio_get_by_name(const char *name) if (strcmp(sdev->name, name) == 0) return sdev; } - if (IS_ENABLED(CONFIG_DM_VIDEO)) { + if (IS_ENABLED(CONFIG_VIDEO)) { /* * We did not find a suitable stdio device. If there is a video * driver with a name starting with 'vidconsole', we can try @@ -340,7 +340,7 @@ int stdio_add_devices(void) #if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) i2c_init_all(); #endif - if (IS_ENABLED(CONFIG_DM_VIDEO)) { + if (IS_ENABLED(CONFIG_VIDEO)) { /* * If the console setting is not in environment variables then * console_init_r() will not be calling iomux_doenv() (which |