Commit b86986c7 authored by Simon Glass's avatar Simon Glass Committed by Anatolij Gustschin
Browse files

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's avatarSimon Glass <sjg@chromium.org>
parent 9330abfb
......@@ -251,7 +251,7 @@ config X86
imply DM_SPI
imply DM_SPI_FLASH
imply DM_USB
imply DM_VIDEO
imply VIDEO
imply SYSRESET
imply SPL_SYSRESET
imply SYSRESET_X86
......
......@@ -1040,7 +1040,7 @@ config ARCH_APPLE
select DM_SERIAL
select DM_SPI
select DM_USB
select DM_VIDEO
select VIDEO
select IOMMU
select LINUX_KERNEL_IMAGE_HEADER
select OF_BOARD_SETUP
......
......@@ -310,7 +310,7 @@ void arch_preboot_os(void)
/* disable video before launching O/S */
ipuv3_fb_shutdown();
#endif
#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO)
#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_VIDEO)
lcdif_power_down();
#endif
}
......
......@@ -249,7 +249,7 @@ config TARGET_KOSAGI_NOVENA
select DM_MMC
select PCI
select DM_SCSI
select DM_VIDEO
select VIDEO
select OF_CONTROL
select SUPPORT_SPL
imply CMD_DM
......
......@@ -598,7 +598,7 @@ const struct boot_mode soc_boot_modes[] = {
void reset_misc(void)
{
#ifndef CONFIG_SPL_BUILD
#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO)
#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_VIDEO)
lcdif_power_down();
#endif
#endif
......
......@@ -447,7 +447,7 @@ int boot_mode_getprisec(void)
void reset_misc(void)
{
#ifndef CONFIG_SPL_BUILD
#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_DM_VIDEO)
#if defined(CONFIG_VIDEO_MXS) && !defined(CONFIG_VIDEO)
lcdif_power_down();
#endif
#endif
......
......@@ -94,7 +94,7 @@ config TARGET_AM335X_GUARDIAN
select DM
select DM_SERIAL
select DM_GPIO
select DM_VIDEO
select VIDEO
select PANEL_HX8238D
config TARGET_AM335X_SL50
......
......@@ -79,7 +79,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc,
}
}
if (IS_ENABLED(CONFIG_DM_VIDEO))
if (IS_ENABLED(CONFIG_VIDEO))
enable_vidconsole();
data = (struct stm32prog_data *)malloc(sizeof(*data));
......
......@@ -788,7 +788,7 @@ config VIDEO_SUNXI
depends on !MACH_SUN9I
depends on !MACH_SUN50I
depends on !SUN50I_GEN_H6
select DM_VIDEO
select VIDEO
select DISPLAY
imply VIDEO_DT_SIMPLEFB
default y
......@@ -853,7 +853,7 @@ config VIDEO_LCD_MODE
config VIDEO_LCD_DCLK_PHASE
int "LCD panel display clock phase"
depends on VIDEO_SUNXI || DM_VIDEO
depends on VIDEO_SUNXI || VIDEO
default 1
range 0 3
---help---
......@@ -928,7 +928,7 @@ config SUNXI_DE2
config VIDEO_DE2
bool "Display Engine 2 video driver"
depends on SUNXI_DE2
select DM_VIDEO
select VIDEO
select DISPLAY
select VIDEO_DW_HDMI
imply VIDEO_DT_SIMPLEFB
......
......@@ -134,7 +134,7 @@ int board_init(void)
#endif
/* Init is handled automatically in the driver-model case */
#if defined(CONFIG_DM_VIDEO)
#if defined(CONFIG_VIDEO)
pin_mux_display();
#endif
/* boot param addr */
......@@ -158,7 +158,7 @@ int board_init(void)
pin_mux_usb();
#endif
#if defined(CONFIG_DM_VIDEO)
#if defined(CONFIG_VIDEO)
board_id = tegra_board_id();
err = tegra_lcd_pmic_init(board_id);
if (err) {
......
......@@ -703,7 +703,7 @@ config VBT_ADDR
config VIDEO_FSP
bool "Enable FSP framebuffer driver support"
depends on HAVE_VBT && DM_VIDEO
depends on HAVE_VBT && VIDEO
help
Turn on this option to enable a framebuffer driver when U-Boot is
using Video BIOS Table (VBT) image for FSP firmware to initialize
......
......@@ -87,7 +87,7 @@ static void at91sam9x5ek_nand_hw_init(void)
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_DM_VIDEO
#ifdef CONFIG_VIDEO
at91_video_show_board_info();
#endif
at91_prepare_cpu_var();
......
......@@ -6,4 +6,4 @@
obj-y += board.o
obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o
obj-$(CONFIG_SPI_FLASH_SFDP_SUPPORT) += mac-spi-nor.o
obj-$(CONFIG_DM_VIDEO) += video_display.o
obj-$(CONFIG_VIDEO) += video_display.o
......@@ -39,7 +39,7 @@ static void board_usb_hw_init(void)
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_DM_VIDEO
#ifdef CONFIG_VIDEO
at91_video_show_board_info();
#endif
at91_pda_detect();
......
......@@ -32,7 +32,7 @@ static void rgb_leds_init(void)
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_DM_VIDEO
#ifdef CONFIG_VIDEO
at91_video_show_board_info();
#endif
at91_pda_detect();
......
......@@ -38,7 +38,7 @@ static void board_usb_hw_init(void)
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_DM_VIDEO
#ifdef CONFIG_VIDEO
at91_video_show_board_info();
#endif
at91_pda_detect();
......
......@@ -186,7 +186,7 @@ int board_late_init(void)
strcat(name, "ek.dtb");
env_set("dtb_name", name);
#endif
#ifdef CONFIG_DM_VIDEO
#ifdef CONFIG_VIDEO
at91_video_show_board_info();
#endif
return 0;
......
......@@ -76,7 +76,7 @@ static void sama5d4_xplained_usb_hw_init(void)
int board_late_init(void)
{
at91_pda_detect();
#ifdef CONFIG_DM_VIDEO
#ifdef CONFIG_VIDEO
at91_video_show_board_info();
#endif
return 0;
......
......@@ -74,7 +74,7 @@ static void sama5d4ek_usb_hw_init(void)
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_DM_VIDEO
#ifdef CONFIG_VIDEO
at91_video_show_board_info();
#endif
return 0;
......
......@@ -4,4 +4,4 @@
# Patrick Bruenn <p.bruenn@beckhoff.com>
obj-y += mx53cx9020.o
obj-$(CONFIG_DM_VIDEO) += mx53cx9020_video.o
obj-$(CONFIG_VIDEO) += mx53cx9020_video.o
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment