This converts the following to Kconfig: CONFIG_VIDEO_OMAP3
Signed-off-by: Adam Ford aford173@gmail.com --- configs/cm_t3517_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/mcx_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + drivers/video/Kconfig | 6 ++++++ include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/mcx.h | 1 - include/configs/mt_ventoux.h | 1 - include/configs/omap3_beagle.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index fa7f336739..faf03542e7 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -53,5 +53,6 @@ CONFIG_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_AM35X=y CONFIG_USB_STORAGE=y +CONFIG_VIDEO_OMAP3=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index 30a745210a..52442cc69a 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -56,5 +56,6 @@ CONFIG_USB_MUSB_UDC=y CONFIG_USB_OMAP3=y CONFIG_TWL4030_USB=y CONFIG_USB_STORAGE=y +CONFIG_VIDEO_OMAP3=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index e14780927c..6e00c43a9a 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -47,6 +47,7 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y +CONFIG_VIDEO_OMAP3=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 81ed01e61d..12501f0dee 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -43,6 +43,7 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_ULPI_VIEWPORT_OMAP=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y +CONFIG_VIDEO_OMAP3=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 1e1a391d7f..69ffa51545 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -74,6 +74,7 @@ CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_VIDEO_OMAP3=y CONFIG_FAT_WRITE=y CONFIG_BCH=y CONFIG_SPL_OF_LIBFDT=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 5ee9032dc9..bf93f07d94 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -408,6 +408,12 @@ config VIDEO_MVEBU Support for the LCD controller integrated in the Marvell Armada XP SoC.
+config VIDEO_OMAP3 + bool "Enable OMAP3+ DSS Support" + depends on ARCH_OMAP2PLUS + help + This enables the Display subsystem (DSS) on OMAP3+ boards. + config I2C_EDID bool "Enable EDID library" depends on DM_I2C diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 415924549b..a896a7f455 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -203,7 +203,6 @@ #define CONFIG_SPLASHIMAGE_GUARD
/* Display Configuration */ -#define CONFIG_VIDEO_OMAP3 #define LCD_BPP LCD_COLOR16
#define CONFIG_SPLASH_SCREEN diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 2c889d4a85..e872641eda 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -210,7 +210,6 @@ #define GREEN_LED_GPIO 186 /* CM-T3517 Green LED is GPIO186 */
/* Display Configuration */ -#define CONFIG_VIDEO_OMAP3 #define LCD_BPP LCD_COLOR16
#define CONFIG_SPLASH_SCREEN diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 0cad187a3c..4fa6aef2a0 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -299,6 +299,5 @@
#define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_VIDEO_OMAP3
#endif /* __CONFIG_H */ diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 3b11cc0e50..e590364441 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -39,7 +39,6 @@
#define CONFIG_SPLASH_SCREEN #define CONFIG_VIDEO_BMP_RLE8 -#define CONFIG_VIDEO_OMAP3 /* DSS Support */
#define CONFIG_EXTRA_ENV_SETTINGS CONFIG_TAM3517_SETTINGS \ "bootcmd=run net_nfs\0" diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 1599b6f0ba..148c641926 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -61,7 +61,6 @@ #define CONFIG_I2C_MULTI_BUS
/* DSS Support */ -#define CONFIG_VIDEO_OMAP3
/* TWL4030 LED Support */ #define CONFIG_TWL4030_LED diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7ced4099f2..f332615ef1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4700,7 +4700,6 @@ CONFIG_VIDEO_MB862xx CONFIG_VIDEO_MB862xx_ACCEL CONFIG_VIDEO_MXS CONFIG_VIDEO_MXS_MODE_SYSTEM -CONFIG_VIDEO_OMAP3 CONFIG_VIDEO_STD_TIMINGS CONFIG_VIDEO_VCXK CONFIG_VID_FLS_ENV