diff mbox series

eb_cpu5282: fix CONFIG_DM_VIDEO build warnings

Message ID 20201018191827.9603-4-agust@denx.de
State Accepted
Commit 8c9940d5ece509ce681bf1b6481832e652526820
Delegated to: Anatolij Gustschin
Headers show
Series eb_cpu5282: fix CONFIG_DM_VIDEO build warnings | expand

Commit Message

Anatolij Gustschin Oct. 18, 2020, 7:18 p.m. UTC 
Remove CONFIG_VIDEO dependency to fix board removal warnings.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Jens Scharsig <esw@bus-elektronik.de>
---
 board/BuS/eb_cpu5282/eb_cpu5282.c     | 7 +++----
 common/stdio.c                        | 4 +++-
 configs/eb_cpu5282_defconfig          | 3 +--
 configs/eb_cpu5282_internal_defconfig | 3 +--
 drivers/video/Kconfig                 | 7 +++++++
 include/configs/eb_cpu5282.h          | 4 ----
 scripts/config_whitelist.txt          | 1 -
 7 files changed, 15 insertions(+), 14 deletions(-)

Comments

Anatolij Gustschin Oct. 26, 2020, 8:23 p.m. UTC | #1 
On Sun, 18 Oct 2020 21:18:18 +0200
Anatolij Gustschin agust@denx.de wrote:

> Remove CONFIG_VIDEO dependency to fix board removal warnings.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Jens Scharsig <esw@bus-elektronik.de>
> ---
>  board/BuS/eb_cpu5282/eb_cpu5282.c     | 7 +++----
>  common/stdio.c                        | 4 +++-
>  configs/eb_cpu5282_defconfig          | 3 +--
>  configs/eb_cpu5282_internal_defconfig | 3 +--
>  drivers/video/Kconfig                 | 7 +++++++
>  include/configs/eb_cpu5282.h          | 4 ----
>  scripts/config_whitelist.txt          | 1 -
>  7 files changed, 15 insertions(+), 14 deletions(-)

Applied to u-boot-video/master.
diff mbox series

Patch

diff --git a/board/BuS/eb_cpu5282/eb_cpu5282.c b/board/BuS/eb_cpu5282/eb_cpu5282.c
index 1d05e40c20..f5e4de3c41 100644
--- 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 84c36a735c..a15f30804b 100644
--- 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 bc0f72f44a..1f89342cb5 100644
--- 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 72e34ba3b4..ad7b7d56bc 100644
--- 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 b1cb745d59..2f3bb4b085 100644
--- 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 db92bbd49a..ab9daa4074 100644
--- 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 dc4f0b050c..3af200bb17 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4069,7 +4069,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