[PATCH 12/38] Convert CONFIG_IMX_VIDEO_SKIP et al to Kconfig

Tom Rini
2022-11-19T23:48:14Z

This converts the following to Kconfig:
CONFIG_IMX_VIDEO_SKIP
CONFIG_IMX_HDMI

Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/aristainetos2c_defconfig | 1 +
configs/aristainetos2ccslb_defconfig | 1 +
configs/cm_fx6_defconfig | 1 +
configs/ge_b1x5v2_defconfig | 1 +
configs/ge_bx50v3_defconfig | 2 ++
configs/gwventana_emmc_defconfig | 2 ++
configs/gwventana_gw5904_defconfig | 2 ++
configs/gwventana_nand_defconfig | 2 ++
configs/imx6dl_icore_nand_defconfig | 1 +
configs/imx6q_icore_nand_defconfig | 1 +
configs/imx6qdl_icore_mmc_defconfig | 1 +
configs/imx6qdl_icore_nand_defconfig | 1 +
configs/m53menlo_defconfig | 1 +
configs/marsboard_defconfig | 2 ++
configs/mx53cx9020_defconfig | 1 +
configs/mx53ppd_defconfig | 1 +
configs/mx6cuboxi_defconfig | 2 ++
configs/mx6qsabrelite_defconfig | 2 ++
configs/mx6sabreauto_defconfig | 2 ++
configs/mx6sabresd_defconfig | 2 ++
configs/nitrogen6dl2g_defconfig | 2 ++
configs/nitrogen6dl_defconfig | 2 ++
configs/nitrogen6q2g_defconfig | 2 ++
configs/nitrogen6q_defconfig | 2 ++
configs/nitrogen6s1g_defconfig | 2 ++
configs/nitrogen6s_defconfig | 2 ++
configs/novena_defconfig | 2 ++
configs/pico-imx6_defconfig | 2 ++
configs/riotboard_defconfig | 2 ++
configs/tbs2910_defconfig | 2 ++
configs/wandboard_defconfig | 2 ++
drivers/video/imx/Kconfig | 7 +++++++
include/configs/apalis_imx6.h | 2 --
include/configs/aristainetos2.h | 4 ----
include/configs/cm_fx6.h | 3 ---
include/configs/colibri_imx6.h | 4 ----
include/configs/embestmx6boards.h | 4 ----
include/configs/ge_b1x5v2.h | 3 ---
include/configs/ge_bx50v3.h | 4 ----
include/configs/gw_ventana.h | 4 ----
include/configs/imx6-engicam.h | 10 ----------
include/configs/m53menlo.h | 1 -
include/configs/mx53cx9020.h | 3 ---
include/configs/mx53ppd.h | 2 --
include/configs/mx6cuboxi.h | 4 ----
include/configs/mx6sabre_common.h | 4 ----
include/configs/nitrogen6x.h | 4 ----
include/configs/novena.h | 4 ----
include/configs/pico-imx6.h | 4 ----
include/configs/tbs2910.h | 4 ----
include/configs/wandboard.h | 4 ----
51 files changed, 58 insertions(+), 72 deletions(-)

diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig
index 5ff29548b0d7..4c7ded9d22fd 100644
--- a/configs/aristainetos2c_defconfig
+++ b/configs/aristainetos2c_defconfig
@@ -118,6 +118,7 @@ CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/aristainetos2ccslb_defconfig b/configs/aristainetos2ccslb_defconfig
index 0a208543dfe4..a23c77af8973 100644
--- a/configs/aristainetos2ccslb_defconfig
+++ b/configs/aristainetos2ccslb_defconfig
@@ -118,6 +118,7 @@ CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index ea7596611c5e..217752cbd4dc 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -116,6 +116,7 @@ CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
CONFIG_VIDEO=y
CONFIG_VIDEO_LOGO=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SOURCE=y
CONFIG_FDT_FIXUP_PARTITIONS=y
diff --git a/configs/ge_b1x5v2_defconfig b/configs/ge_b1x5v2_defconfig
index 180a6a8568e9..353942dd787b 100644
--- a/configs/ge_b1x5v2_defconfig
+++ b/configs/ge_b1x5v2_defconfig
@@ -133,6 +133,7 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_VIDEO=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=30000
CONFIG_IMX_WATCHDOG=y
CONFIG_BCH=y
diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig
index d9fbdbd64018..e35788fd850a 100644
--- a/configs/ge_bx50v3_defconfig
+++ b/configs/ge_bx50v3_defconfig
@@ -98,6 +98,8 @@ CONFIG_VIDEO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_IMX_WATCHDOG=y
CONFIG_BCH=y
diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig
index b275247d25d4..f999b4477553 100644
--- a/configs/gwventana_emmc_defconfig
+++ b/configs/gwventana_emmc_defconfig
@@ -163,6 +163,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_PANEL is not set
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_HIDE_LOGO_VERSION=y
diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig
index 6169042c7e6a..4c6291f0c51a 100644
--- a/configs/gwventana_gw5904_defconfig
+++ b/configs/gwventana_gw5904_defconfig
@@ -167,6 +167,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_PANEL is not set
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_HIDE_LOGO_VERSION=y
diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig
index 6d57ad49a13c..4e062e477e8c 100644
--- a/configs/gwventana_nand_defconfig
+++ b/configs/gwventana_nand_defconfig
@@ -173,6 +173,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_PANEL is not set
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_HIDE_LOGO_VERSION=y
diff --git a/configs/imx6dl_icore_nand_defconfig b/configs/imx6dl_icore_nand_defconfig
index fe4866e2f512..759bbf9b34e5 100644
--- a/configs/imx6dl_icore_nand_defconfig
+++ b/configs/imx6dl_icore_nand_defconfig
@@ -74,6 +74,7 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/imx6q_icore_nand_defconfig b/configs/imx6q_icore_nand_defconfig
index 2cb995e7ae1d..c7d31d502ba2 100644
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@ -75,6 +75,7 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig
index 9f6d29a268b4..f5a7e9697863 100644
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@ -98,6 +98,7 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig
index 2cb995e7ae1d..c7d31d502ba2 100644
--- a/configs/imx6qdl_icore_nand_defconfig
+++ b/configs/imx6qdl_icore_nand_defconfig
@@ -75,6 +75,7 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig
index a5760242be51..e332de2aa9e0 100644
--- a/configs/m53menlo_defconfig
+++ b/configs/m53menlo_defconfig
@@ -122,6 +122,7 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_SPLASH_SOURCE=y
diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index a6cffa2db65f..27c5ebe000f4 100644
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -67,6 +67,8 @@ CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/mx53cx9020_defconfig b/configs/mx53cx9020_defconfig
index b34f2e7e6b4c..c20c6a40a1d7 100644
--- a/configs/mx53cx9020_defconfig
+++ b/configs/mx53cx9020_defconfig
@@ -40,3 +40,4 @@ CONFIG_VIDEO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig
index ed4ebbbe3c27..d8cb654a59fd 100644
--- a/configs/mx53ppd_defconfig
+++ b/configs/mx53ppd_defconfig
@@ -81,6 +81,7 @@ CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
CONFIG_WATCHDOG_TIMEOUT_MSECS=8000
CONFIG_IMX_WATCHDOG=y
CONFIG_BCH=y
diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig
index 0904bd11013c..a9957aba7c2a 100644
--- a/configs/mx6cuboxi_defconfig
+++ b/configs/mx6cuboxi_defconfig
@@ -84,6 +84,8 @@ CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index becf36e01c6b..6869b903b7f1 100644
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -89,6 +89,8 @@ CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 634473f30743..8e94a84409df 100644
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -120,6 +120,8 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index 4f7d3704203e..9472e032c814 100644
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -125,6 +125,8 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 3ec4df14a864..87ca8487fbd1 100644
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index 6a6510e12e23..1bdd2f02e9d0 100644
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index e2acce8757e5..dc010b02a91f 100644
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -97,6 +97,8 @@ CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index ceb843f15e07..fe3291d22b7f 100644
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -97,6 +97,8 @@ CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index bb0d6f5439fe..b31652495f23 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 0232d0c9d767..eb11959e4ae4 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -94,6 +94,8 @@ CONFIG_VIDEO=y
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_VIDEO_BMP_GZIP=y
diff --git a/configs/novena_defconfig b/configs/novena_defconfig
index 5f761799a21f..3999ae1c829d 100644
--- a/configs/novena_defconfig
+++ b/configs/novena_defconfig
@@ -99,5 +99,7 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/pico-imx6_defconfig b/configs/pico-imx6_defconfig
index 9b3f76d8e5d8..a6ed013f8b6b 100644
--- a/configs/pico-imx6_defconfig
+++ b/configs/pico-imx6_defconfig
@@ -99,6 +99,8 @@ CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 1bf40270e833..9f8fbc85c8ab 100644
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -84,6 +84,8 @@ CONFIG_VIDEO_LOGO=y
CONFIG_SYS_WHITE_ON_BLACK=y
# CONFIG_PANEL is not set
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig
index 4c5b98bc656b..0df8a6890021 100644
--- a/configs/tbs2910_defconfig
+++ b/configs/tbs2910_defconfig
@@ -114,6 +114,8 @@ CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDCONSOLE_AS_LCD=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_VIDEO_BMP_RLE8=y
# CONFIG_GZIP is not set
CONFIG_OF_LIBFDT_ASSUME_MASK=0xff
diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index 525f55ee00c6..a6baff1e24c9 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -83,6 +83,8 @@ CONFIG_VIDEO_LOGO=y
# CONFIG_VIDEO_BPP32 is not set
CONFIG_SYS_WHITE_ON_BLACK=y
CONFIG_VIDEO_IPUV3=y
+CONFIG_IMX_VIDEO_SKIP=y
+CONFIG_IMX_HDMI=y
CONFIG_SPLASH_SCREEN=y
CONFIG_SPLASH_SCREEN_ALIGN=y
CONFIG_BMP_16BPP=y
diff --git a/drivers/video/imx/Kconfig b/drivers/video/imx/Kconfig
index afe950b6df76..34e8b640595b 100644
--- a/drivers/video/imx/Kconfig
+++ b/drivers/video/imx/Kconfig
@@ -6,3 +6,10 @@ config VIDEO_IPUV3
This enables framebuffer driver for i.MX processors working
on the IPUv3(Image Processing Unit) internal graphic processor.

+config IMX_VIDEO_SKIP
+ bool "Enable calling board_video_skip function"
+ depends on VIDEO_IPUV3
+
+config IMX_HDMI
+ bool "Enable HDMI support in IPUv3"
+ depends on VIDEO_IPUV3
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index c9375b4d162a..a3c86545f077 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -32,8 +32,6 @@
#define CONFIG_USBD_HS

/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP

/* Command definition */

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index b1ec8ef269c6..6faf544d21b6 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -420,10 +420,6 @@

/* UBI support */

-/* Framebuffer */
-/* check this console not needed, after test remove it */
-#define CONFIG_IMX_VIDEO_SKIP
-
#define CONFIG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,serial#:sw,board_type:sw," \
"sysnum:dw,panel:sw,ipaddr:iw,serverip:iw"

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index d5c039579759..9df8baa8a969 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -143,9 +143,6 @@

/* misc */

-/* Display */
-#define CONFIG_IMX_HDMI
-
/* EEPROM */

#endif /* __CONFIG_CM_FX6_H */
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index c6a79debd6ba..60a3862a4d12 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -28,10 +28,6 @@
/* Client */
#define CONFIG_USBD_HS

-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
/* Command definition */

#undef CONFIG_IPADDR
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 29b7748e7865..22e0fa5aabfd 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -43,10 +43,6 @@
#define CFG_SYS_FSL_USDHC_NUM 2
#endif

-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
#include "mx6_common.h"

/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index a8a6229f526f..1458b187de28 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -28,9 +28,6 @@
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS

-/* Video */
-#define CONFIG_IMX_VIDEO_SKIP
-
/* Memory */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 705cb763a66d..f62b8f175e1f 100644
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -102,8 +102,4 @@

#define CFG_SYS_FSL_USDHC_NUM 3

-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
#endif /* __GE_BX50V3_CONFIG_H */
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 6c5ca0a52057..4d0a78c6269c 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -40,10 +40,6 @@
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USBD_HS

-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
/* Miscellaneous configurable options */

/* Memory configuration */
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index 1f30798550c6..36b6b95b84de 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -132,14 +132,4 @@
/* MTD device */
#endif

-/* Falcon Mode */
-#ifdef CONFIG_SPL_OS_BOOT
-/* MMC support: args@1MB kernel@2MB */
-#endif
-
-/* Framebuffer */
-#ifdef CONFIG_VIDEO_IPUV3
-# define CONFIG_IMX_VIDEO_SKIP
-#endif
-
#endif /* __IMX6_ENGICAM_CONFIG_H */
diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index eca86a94519a..66591390d903 100644
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -78,7 +78,6 @@

/* LVDS display */
#define CFG_SYS_LDB_CLOCK 33260000
-#define CONFIG_IMX_VIDEO_SKIP

/* Watchdog */

diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h
index 2bc462cc37ef..cd806cb698e9 100644
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -66,7 +66,4 @@

/* environment organization */

-/* Framebuffer and LCD */
-#define CONFIG_IMX_VIDEO_SKIP
-
#endif /* __CONFIG_H */
diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index 963dd92dd709..9464d6e44aea 100644
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -102,6 +102,4 @@

/* FLASH and environment organization */

-#define CONFIG_IMX_VIDEO_SKIP
-
#endif /* __CONFIG_H */
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 12741c08de58..f7f209c20b59 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -14,10 +14,6 @@
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR

-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
/* USB */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 5e95e430c49f..6294fd1e2c42 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -145,10 +145,6 @@

/* Environment organization */

-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
#define CONFIG_USBD_HS

#endif /* __MX6QSABRE_COMMON_CONFIG_H */
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index dd7f9513199c..5020b3bb71db 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -26,10 +26,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0

-/* Framebuffer and LCD */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
#ifdef CONFIG_CMD_MMC
#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
#else
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 16a89b97b06c..4e46dfc526ce 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -63,10 +63,6 @@
#define CONFIG_USBD_HS
#endif

-/* Video output */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
/* Extra U-Boot environment. */
#define CONFIG_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 9e6c210c40b4..6d7873daa0ad 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -100,8 +100,4 @@
/* Ethernet Configuration */
#define CONFIG_FEC_MXC_PHYADDR 1

-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
#endif /* __CONFIG_H * */
diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index f6544f6226c7..fcc967494220 100644
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -20,10 +20,6 @@

#define CFG_SYS_BOOTMAPSZ 0x10000000

-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
/* PCI */
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(7, 12)
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 23027b1d3d9e..6923009d4598 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -20,10 +20,6 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0

-/* Framebuffer */
-#define CONFIG_IMX_HDMI
-#define CONFIG_IMX_VIDEO_SKIP
-
#define CONFIG_EXTRA_ENV_SETTINGS \
"console=ttymxc0\0" \
"splashpos=m,m\0" \
--
2.25.1