diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-18 16:46:31 +0300 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2022-10-30 22:07:17 +0300 |
| commit | b86986c7b314f1378ca5be8df49310a6ce7302f8 (patch) | |
| tree | 11f72c50e524ae5b37e934e9a5d0558c00c6ee97 /include | |
| parent | 9330abfb4a00512213d34147b78d2041fd467c6e (diff) | |
| download | u-boot-b86986c7b314f1378ca5be8df49310a6ce7302f8.tar.xz | |
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 'include')
| -rw-r--r-- | include/asm-generic/global_data.h | 4 | ||||
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 2 | ||||
| -rw-r--r-- | include/configs/imxrt1050-evk.h | 2 | ||||
| -rw-r--r-- | include/configs/meson64.h | 2 | ||||
| -rw-r--r-- | include/configs/pico-imx6ul.h | 4 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 2 | ||||
| -rw-r--r-- | include/configs/tegra-common-post.h | 2 |
7 files changed, 8 insertions, 10 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 8ca93ac526..c4b2bb4497 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -68,7 +68,7 @@ struct global_data { * @mem_clk: memory clock rate in Hz */ unsigned long mem_clk; -#if defined(CONFIG_DM_VIDEO) +#if defined(CONFIG_VIDEO) /** * @fb_base: base address of frame buffer memory */ @@ -359,7 +359,7 @@ struct global_data { */ struct membuff console_in; #endif -#ifdef CONFIG_DM_VIDEO +#ifdef CONFIG_VIDEO /** * @video_top: top of video frame buffer area */ diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 79b1284cc7..321edabe98 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -137,7 +137,7 @@ /* USB Device Firmware Update support */ #define DFU_DEFAULT_POLL_TIMEOUT 300 -#if defined(CONFIG_DM_VIDEO) +#if defined(CONFIG_VIDEO) #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #endif diff --git a/include/configs/imxrt1050-evk.h b/include/configs/imxrt1050-evk.h index e36718dc82..d1a7dab37c 100644 --- a/include/configs/imxrt1050-evk.h +++ b/include/configs/imxrt1050-evk.h @@ -18,7 +18,7 @@ #define DMAMEM_BASE (PHYS_SDRAM + PHYS_SDRAM_SIZE - \ DMAMEM_SZ_ALL) -#ifdef CONFIG_DM_VIDEO +#ifdef CONFIG_VIDEO #define CONFIG_EXTRA_ENV_SETTINGS \ "stdin=serial\0" \ "stdout=serial,vidconsole\0" \ diff --git a/include/configs/meson64.h b/include/configs/meson64.h index 40803ee9da..0c41df2a95 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -17,7 +17,7 @@ #endif /* For splashscreen */ -#ifdef CONFIG_DM_VIDEO +#ifdef CONFIG_VIDEO #define STDOUT_CFG "vidconsole,serial" #else #define STDOUT_CFG "serial" diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 2ac48c40c9..c0d837d7c5 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -102,9 +102,7 @@ #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE -/* environment organization */ - -#ifdef CONFIG_DM_VIDEO +#ifdef CONFIG_VIDEO #define MXS_LCDIF_BASE MX6UL_LCDIF1_BASE_ADDR #endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index fe90d55bd4..12666b7818 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -301,7 +301,7 @@ "stdin=serial\0" #endif -#ifdef CONFIG_DM_VIDEO +#ifdef CONFIG_VIDEO #define CONSOLE_STDOUT_SETTINGS \ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 823b5d63d0..4e20e1d198 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -37,7 +37,7 @@ #define STDIN_KBD_USB "" #endif -#ifdef CONFIG_DM_VIDEO +#ifdef CONFIG_VIDEO #define STDOUT_VIDEO ",vidconsole" #else #define STDOUT_VIDEO "" |