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>

diff --git a/configs/aristainetos2c_defconfig b/configs/aristainetos2c_defconfig
index 5ff29548b0d7202fda23f899d44a0f31eefe4d7f..4c7ded9d22fd3736e5fc8b58a12102996f248a4a 100644 (file)
--- 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 0a208543dfe4996fd8265c55dba6b02d7b500ce5..a23c77af897360fb600ad2969ed032712564a9ce 100644 (file)
--- 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 ea7596611c5ea70e1e3c65b375a228076c6a5ec5..217752cbd4dc86914da949a36fcc812f00052b39 100644 (file)
--- 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 180a6a8568e9de90f896b6133474d1f88e6d9e25..353942dd787b16a4480530e5e812af92f7637835 100644 (file)
--- 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 d9fbdbd64018f77636550d540392a63f09ef5a8f..e35788fd850a0fe8e6fc38ff39d326948123a8f2 100644 (file)
--- 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 b275247d25d4a19874fa6721622f12edb90057f8..f999b44775533d152abe2fe7be576d3c5083ffc3 100644 (file)
--- 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 6169042c7e6af09adaa410182bbfd3ebb128d43a..4c6291f0c51ac83f2854f3c560568ad85e6c7a85 100644 (file)
--- 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 6d57ad49a13c693ad7965e16a83e29ec6f068985..4e062e477e8cb40b07c3a18c84fa592f89acb2f9 100644 (file)
--- 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 fe4866e2f5125b1c8164b44e34679d3170a55f25..759bbf9b34e5e9fe08244896a04e2aebeb8e52d3 100644 (file)
--- 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 2cb995e7ae1d9685a071b66fde35a7e59d7b4ed8..c7d31d502ba2a6e5a3da7c4af44dbc32743eb01f 100644 (file)
--- 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 9f6d29a268b4c05990f959309ff4d90fe73a29b3..f5a7e969786314e4e10296b544abc015bba31b63 100644 (file)
--- 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 2cb995e7ae1d9685a071b66fde35a7e59d7b4ed8..c7d31d502ba2a6e5a3da7c4af44dbc32743eb01f 100644 (file)
--- 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 a5760242be513f0aa8d86b8a7e701e206f52f329..e332de2aa9e03d93f0e3d4f0e52943b87e069d77 100644 (file)
--- 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 a6cffa2db65f4903b9a0efed9253a7475e25fbf9..27c5ebe000f43e76d9803514ba52d4c5366c1ccf 100644 (file)
--- 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 b34f2e7e6b4c1f77c6cf1aefcc64bfc95e87199c..c20c6a40a1d7411724426a36412b903fa9ee1e63 100644 (file)
--- 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 ed4ebbbe3c27b8238ec8f0a39724e5efa1843c99..d8cb654a59fde57f68cd5137ff06a0610de07c5a 100644 (file)
--- 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 0904bd11013c96e07ef2ea5457a18eac1688f8ba..a9957aba7c2a487f1c10ae6778264529d51ca9c5 100644 (file)
--- 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 becf36e01c6be269b033d60b2bcbdc1b4b8feb2d..6869b903b7f1ae94836971cbc2857d4eed0cfe67 100644 (file)
--- 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 634473f30743227f6c5671050f487bd0e12093b4..8e94a84409dff6153a3c9d5e6aff5b85829c4fcb 100644 (file)
--- 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 4f7d3704203edbe7d6f4a7e24a28ac7e3c7360a6..9472e032c81422d0b36147430b1d07e870f46520 100644 (file)
--- 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 3ec4df14a864ac5cbbe86056b43d99f6252dec93..87ca8487fbd1e96d02bc3951272fd66e299d12a0 100644 (file)
--- 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 6a6510e12e23beaf242571fdc466a787e4c8d9e5..1bdd2f02e9d04b8e28f0262de98108022682b021 100644 (file)
--- 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 e2acce8757e5ce5e7957a83e0c51dbc19d07502b..dc010b02a91f1b7ba75a54e8a4d40fd479da021d 100644 (file)
--- 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 ceb843f15e07640a214777029b492c5d05c1acca..fe3291d22b7fee2c8521268e0959794eccaf1a9f 100644 (file)
--- 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 bb0d6f5439fe49cff7bb5e10ec6c2eb33ac08444..b31652495f23a1e2448d85e3fc32c2ac01b15ec0 100644 (file)
--- 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 0232d0c9d767c18f4549113b5f42e87317ba512d..eb11959e4ae4dd89fda8ce1400d5106d6271a095 100644 (file)
--- 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 5f761799a21fea45e163b6992b1af7f94b4c0c65..3999ae1c829d4b207943035cbd41398ed5a9e4e7 100644 (file)
--- 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 9b3f76d8e5d89a19fc303b8f8a9327c4714e22f6..a6ed013f8b6b643ee5f98c15de1c0f72d12d6f4a 100644 (file)
--- 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 1bf40270e833b03c880cd068707bd72d583bae01..9f8fbc85c8abf982238ba305a3e504baf8aa2395 100644 (file)
--- 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 4c5b98bc656b2997d4ced15a9434da3b6b0f80e6..0df8a689002161add11cc4760e84abecd23a5c0c 100644 (file)
--- 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 525f55ee00c617c95d016c2727fe5482227ff945..a6baff1e24c9dc2faed04fc5f05a636ec038330d 100644 (file)
--- 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 afe950b6df764ec76a4f875369504a87156c713f..34e8b640595b85678e386a3a251340031780a72e 100644 (file)
--- 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 c9375b4d162a40e35a6f33cb8665806e889d3838..a3c86545f0772e753a4171ce42287f8b0f460341 100644 (file)
--- 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 b1ec8ef269c6af39202af0fd53129a7bd1def752..6faf544d21b6fee220aba69d9466c47b0ee26b65 100644 (file)
--- 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 d5c039579759e3a1ced878ed9de504354cec92fc..9df8baa8a969ccf6b4dd5d3f575ffe5339184c45 100644 (file)
--- 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 c6a79debd6bad5568b462c2881f34cd0b543fda3..60a3862a4d1205ce726019d06cdb1ff04e252d0d 100644 (file)
--- 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 29b7748e7865b3e7ff1d5460fe967cb165bea535..22e0fa5aabfd55426f7d0bf122577504d4f91ecf 100644 (file)
--- 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 a8a6229f526fc96d95280365ab8931e8142ba133..1458b187de28e99770bf61a6baca46babd7b32cf 100644 (file)
--- 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 705cb763a66d5a6ae223de83c1f1310ee797ba1b..f62b8f175e1f561355846cd64f4e5982d5b4fc02 100644 (file)
--- 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 6c5ca0a520572fb96dd87893a67b48f657939542..4d0a78c6269c9c670394421637135fa9c8a1fdaa 100644 (file)
--- 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 1f30798550c6adcbb2dd01a350f2681b6b625466..36b6b95b84de01aea0b203b5508de16b23afccac 100644 (file)
--- 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 eca86a94519ac740a2b529988dbf7cc47cf9687f..66591390d9030029870ee1c181f0f4723606b92f 100644 (file)
--- 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 2bc462cc37ef81f66f3d4e461f6742d7e0a2b6a9..cd806cb698e941263e2fd8ebcd931de403c3263e 100644 (file)
--- 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 963dd92dd709897b3c3a070ffa21851aacf87efa..9464d6e44aeabaa5d345efb98bac46ea6892f0f2 100644 (file)
--- 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 12741c08de58865c2479fa1e4d30058ee12c0414..f7f209c20b5916b9b113d65edbc52fd1b5465a90 100644 (file)
--- 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 5e95e430c49faa5c9ff5b1a0529e5ea777af13c4..6294fd1e2c4276162bfe89fd7392c1ea3085e1a2 100644 (file)
--- 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 dd7f9513199c52405c772c385cd57681a658e961..5020b3bb71dbeb5f5d9ad3aba5cf2ca961848321 100644 (file)
--- 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 16a89b97b06c469e01b5115275be954502c7b820..4e46dfc526ce08f1247683552a5db4964a86f2e7 100644 (file)
--- 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 9e6c210c40b4dcb8f7c6cb2dd480096375930ad1..6d7873daa0adf1a1930e34d35b25c138b542d4c8 100644 (file)
--- 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 f6544f6226c7aa62f3039e4632688ea59894bcf6..fcc9674942209996b87c45299d9e1e8e066d9689 100644 (file)
--- 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 23027b1d3d9e8d83857a55f1fe629c807a9529e1..6923009d459851fd319151cbc5ae4caa3bd7eb94 100644 (file)
--- 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" \