Convert CONFIG_IMX_VIDEO_SKIP et al to Kconfig

This converts the following to Kconfig: CONFIG_IMX_VIDEO_SKIP CONFIG_IMX_HDMI Signed-off-by: Tom Rini <trini@konsulko.com>
2022-11-19 18:45:19 -05:00 · 2022-11-19 18:45:19 -05:00 · 0ea156ba00
commit 0ea156ba00
parent 4eea765740
51 changed files with 58 additions and 72 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */

--- 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"

--- 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 */
--- 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
--- 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,
--- 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

--- 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 */
--- 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 */
--- 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 */
--- 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 */

--- 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 */
--- 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 */
--- 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)

--- 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 */
--- 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
--- 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"						\
--- 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 * */
--- 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)
--- 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" \