eb_cpu5282: fix CONFIG_DM_VIDEO build warnings

Remove CONFIG_VIDEO dependency to fix board removal warnings.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Jens Scharsig <esw@bus-elektronik.de>

diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 1d05e40c209b66985e5f8e725ecf31fd98b0013c..f5e4de3c4183203f77823ea22793a12e94382565 100644 (file)
--- a/board/BuS/eb_cpu5282/eb_cpu5282.c
+++ b/board/BuS/eb_cpu5282/eb_cpu5282.c
@@ -20,7 +20,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_VIDEO
+#if IS_ENABLED(CONFIG_VIDEO_VCXK)
 unsigned long display_width;
 unsigned long display_height;
 #endif
@@ -183,8 +183,7 @@ void __led_set(led_id_t mask, int state)
                MCFGPTA_GPTPORT &= ~(1 << 3);
 }
 
-#if defined(CONFIG_VIDEO)
-
+#if IS_ENABLED(CONFIG_VIDEO_VCXK)
 int drv_video_init(void)
 {
        char *s;
@@ -225,7 +224,7 @@ int drv_video_init(void)
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef CONFIG_VIDEO
+#if IS_ENABLED(CONFIG_VIDEO_VCXK)
 int do_brightness(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int rcode = 0;

diff --git a/common/stdio.c b/common/stdio.c
index 84c36a735c00dd238061ad1039aa8af8a96b1825..a15f30804bf58a5dfa1d507b13b41c2a90942887 100644 (file)
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -356,7 +356,9 @@ int stdio_add_devices(void)
        } else {
                if (IS_ENABLED(CONFIG_LCD))
                        drv_lcd_init();
-               if (IS_ENABLED(CONFIG_VIDEO) || IS_ENABLED(CONFIG_CFB_CONSOLE))
+               if (IS_ENABLED(CONFIG_VIDEO) ||
+                   IS_ENABLED(CONFIG_CFB_CONSOLE) ||
+                   IS_ENABLED(CONFIG_VIDEO_VCXK))
                        drv_video_init();
        }
 

diff --git a/configs/eb_cpu5282_defconfig b/configs/eb_cpu5282_defconfig
index bc0f72f44a5a852764231d295a8748b0e25936ce..1f89342cb53c8ff619a9e41697904f9bb22d7ba1 100644 (file)
--- a/configs/eb_cpu5282_defconfig
+++ b/configs/eb_cpu5282_defconfig
@@ -32,6 +32,5 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y
 CONFIG_MCFFEC=y
 CONFIG_MII=y
-CONFIG_VIDEO=y
-# CONFIG_CFB_CONSOLE is not set
+CONFIG_VIDEO_VCXK=y
 CONFIG_SPLASH_SCREEN=y

diff --git a/configs/eb_cpu5282_internal_defconfig b/configs/eb_cpu5282_internal_defconfig
index 72e34ba3b4b77b50b1b2b43e541bfdf28b6a281a..ad7b7d56bcc18e0feac4805244bfc5d8286d7776 100644 (file)
--- a/configs/eb_cpu5282_internal_defconfig
+++ b/configs/eb_cpu5282_internal_defconfig
@@ -31,6 +31,5 @@ CONFIG_SYS_FLASH_CFI=y
 CONFIG_DM_ETH=y
 CONFIG_MCFFEC=y
 CONFIG_MII=y
-CONFIG_VIDEO=y
-# CONFIG_CFB_CONSOLE is not set
+CONFIG_VIDEO_VCXK=y
 CONFIG_SPLASH_SCREEN=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index b1cb745d59e7a80274f14a54a781e6eff6db51da..2f3bb4b0853c6ee3dae798675e5ba2ae3b98abae 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -972,4 +972,11 @@ config BMP_32BPP
        help
          Support display of bitmaps file with 32-bit-per-pixel.
 
+config VIDEO_VCXK
+       bool "Enable VCXK video controller driver support"
+       default n
+       help
+         This enables VCXK driver which can be used with VC2K, VC4K
+         and VC8K devices on various boards from BuS Elektronik GmbH.
+
 endmenu

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index db92bbd49a4d47fbfcf0efb279ad83a652483cae..ab9daa4074ac12a9c8815b55a3156ba9d5e692a2 100644 (file)
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -212,9 +212,6 @@
  * VIDEO configuration
  */
 
-#ifdef CONFIG_VIDEO
-#define CONFIG_VIDEO_VCXK                      1
-
 #define CONFIG_SYS_VCXK_DEFAULT_LINEALIGN      2
 #define        CONFIG_SYS_VCXK_DOUBLEBUFFERED          1
 #define CONFIG_SYS_VCXK_BASE                   CONFIG_SYS_CS2_BASE
@@ -235,6 +232,5 @@
 #define CONFIG_SYS_VCXK_INVERT_DDR             MCFGPIO_DDRE
 #define CONFIG_SYS_VCXK_INVERT_PIN             MCFGPIO_PORT2
 
-#endif /* CONFIG_VIDEO */
 #endif /* _CONFIG_M5282EVB_H */
 /*---------------------------------------------------------------------*/

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 14c132e7c410ce00d5fbf807e168a6052c1a2733..a9508448d43e51346f573d6ffe27de2d2f029e2c 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4067,7 +4067,6 @@ CONFIG_VIDEO_MB862xx_ACCEL
 CONFIG_VIDEO_MXS
 CONFIG_VIDEO_MXS_MODE_SYSTEM
 CONFIG_VIDEO_STD_TIMINGS
-CONFIG_VIDEO_VCXK
 CONFIG_VID_FLS_ENV
 CONFIG_VM86
 CONFIG_VOIPAC_LCD