diff options
| -rw-r--r-- | configs/cm_t3517_defconfig | 1 | ||||
| -rw-r--r-- | configs/cm_t35_defconfig | 1 | ||||
| -rw-r--r-- | configs/mcx_defconfig | 1 | ||||
| -rw-r--r-- | configs/mt_ventoux_defconfig | 1 | ||||
| -rw-r--r-- | configs/omap3_beagle_defconfig | 1 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 6 | ||||
| -rw-r--r-- | include/configs/cm_t35.h | 1 | ||||
| -rw-r--r-- | include/configs/cm_t3517.h | 1 | ||||
| -rw-r--r-- | include/configs/mcx.h | 1 | ||||
| -rw-r--r-- | include/configs/mt_ventoux.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_beagle.h | 1 | ||||
| -rw-r--r-- | 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 edb114e531f..b2452ff5956 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -55,5 +55,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 95dcc06a4b5..f8f1862c3f3 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -57,5 +57,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 34146404840..811123843c1 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -50,6 +50,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 ab3a9047009..ae88b7680af 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -46,6 +46,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 7709d2dc244..f26f5ad28c7 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -75,6 +75,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 ecb57d80d58..ed0b21f2a72 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" default n diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 646da7fb82b..c7ac8d1fcc3 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -198,7 +198,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 0ab3930e5a4..c3ec812daf7 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -203,7 +203,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 94b133223c0..176af724e81 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -292,6 +292,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 3b11cc0e50e..e590364441e 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 252b8f9a5fd..1fbe27e1aad 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -58,7 +58,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 b7d75aac1d2..83d9793a26b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4666,7 +4666,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 |