video: Migrate exynos display options to Kconfig

Following how it's done for the majority of drivers, add a new
VIDEO_EXYNOS option and Kconfig file under drivers/video/exynos and list
the current options there.

Cc: Anatolij Gustschin <agust@denx.de>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/configs/peach-pi_defconfig b/configs/peach-pi_defconfig
index 27be6075661b229ff7007b6ec8cd0f696ca9aeb7..d6662e18ab7b9b46e1aa0da1f5e229245b27a7d7 100644 (file)
--- a/configs/peach-pi_defconfig
+++ b/configs/peach-pi_defconfig
@@ -84,6 +84,9 @@ CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
 CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_DISPLAY=y
+CONFIG_VIDEO_EXYNOS=y
+CONFIG_EXYNOS_DP=y
+CONFIG_EXYNOS_FB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_LCD=y

diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 296b4ceb195b468a1461ae2bde05e571f5817792..07740571c7572b1e7e526e59137a410e7ced2500 100644 (file)
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -83,6 +83,9 @@ CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
 CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_DISPLAY=y
+CONFIG_VIDEO_EXYNOS=y
+CONFIG_EXYNOS_DP=y
+CONFIG_EXYNOS_FB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_LCD=y

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 4377a58130e300e47e050632ec072d6e16a1b5dd..8d1b28dcf8c56a9c2868d0339f1cb853f65e8cc1 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -94,6 +94,9 @@ CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
 CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_DISPLAY=y
+CONFIG_VIDEO_EXYNOS=y
+CONFIG_EXYNOS_DP=y
+CONFIG_EXYNOS_FB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_VIDEO_BRIDGE_NXP_PTN3460=y

diff --git a/configs/spring_defconfig b/configs/spring_defconfig
index ad017564d994395df9535c792f719dc126ac3b54..366790b4efe49f2e0433276399de2323a6e1c2dd 100644 (file)
--- a/configs/spring_defconfig
+++ b/configs/spring_defconfig
@@ -95,6 +95,9 @@ CONFIG_DM_VIDEO=y
 # CONFIG_VIDEO_BPP8 is not set
 CONFIG_VIDCONSOLE_AS_LCD=y
 CONFIG_DISPLAY=y
+CONFIG_VIDEO_EXYNOS=y
+CONFIG_EXYNOS_DP=y
+CONFIG_EXYNOS_FB=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_LCD=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 965b5879274ef253fea78768442fe9e1e3250059..4ecc158c4605e05f2923be568ea41f4cc2afec0f 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -583,6 +583,8 @@ config ATMEL_HLCD
 
 source "drivers/video/ti/Kconfig"
 
+source "drivers/video/exynos/Kconfig"
+
 config LOGICORE_DP_TX
        bool "Enable Logicore DP TX driver"
        depends on DISPLAY

diff --git a/drivers/video/exynos/Kconfig b/drivers/video/exynos/Kconfig
new file mode 100644 (file)
index 0000000..37e661b
--- /dev/null
+++ b/drivers/video/exynos/Kconfig
@@ -0,0 +1,20 @@
+
+menuconfig VIDEO_EXYNOS
+       bool "Enable Exynos video support"
+       depends on DM_VIDEO
+       help
+         Enable support for various video output options on Exynos SoCs.
+
+if VIDEO_EXYNOS
+
+config EXYNOS_DP
+       bool "Exynos Display Port support"
+
+config EXYNOS_FB
+       bool "Exynos FIMD support"
+
+config EXYNOS_MIPI_DSIM
+       bool "Exynos MIPI DSI support"
+       depends on EXYNOS_FB
+
+endif

diff --git a/include/configs/exynos5-dt-common.h b/include/configs/exynos5-dt-common.h
index 38f6940a3dbc916414ff6704939ec12646a211f5..a94f5a15f0d13ac77048ac51f0eed437dfd9a1cc 100644 (file)
--- a/include/configs/exynos5-dt-common.h
+++ b/include/configs/exynos5-dt-common.h
@@ -19,11 +19,4 @@
 #define FLASH_SIZE             (4 << 20)
 #define CONFIG_SPI_BOOTING
 
-/* Display */
-#ifdef CONFIG_LCD
-#define CONFIG_EXYNOS_FB
-#define CONFIG_EXYNOS_DP
-#define LCD_BPP                        LCD_COLOR16
-#endif
-
 #endif

diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h
index ff4180a8331dae998d7681a0a416f16457046055..7a8d3c63d445e079b34df524d7f488b10bb2b7fe 100644 (file)
--- a/include/configs/peach-pi.h
+++ b/include/configs/peach-pi.h
@@ -22,13 +22,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE  0x20000000
 
-/* Display */
-#ifdef CONFIG_LCD
-#define CONFIG_EXYNOS_FB
-#define CONFIG_EXYNOS_DP
-#define LCD_BPP                        LCD_COLOR16
-#endif
-
 #define CONFIG_POWER_TPS65090_EC
 
 /* DRAM Memory Banks */

diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 1ea3b650cd26835b471fb7115511fc5170472b95..c6d2b23197d105feb1f99293ed67dd81dca14382 100644 (file)
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -12,7 +12,4 @@
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#undef CONFIG_EXYNOS_FB
-#undef CONFIG_EXYNOS_DP
-
 #endif /* __CONFIG_SMDK_H */

diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index f8d2fafd278869c09231451cd0077c4f8ab17ce7..81ae6936178aa0894ccdaa971a2edf83a4b98df4 100644 (file)
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -12,9 +12,6 @@
 #include <configs/exynos5-dt-common.h>
 #include <configs/exynos5-common.h>
 
-#undef CONFIG_EXYNOS_FB
-#undef CONFIG_EXYNOS_DP
-
 #define CONFIG_SMDK5420                        /* which is in a SMDK5420 */
 
 #define CONFIG_SYS_SDRAM_BASE  0x20000000

diff --git a/include/configs/trats.h b/include/configs/trats.h
index ee4a583baa82096e60291b34cd087f17d566efe3..bca239ae817e7bbf4fed1f7da6cbe160bfd2ef8b 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -150,7 +150,6 @@
 
 /* LCD */
 #define CONFIG_FB_ADDR         0x52504000
-#define CONFIG_EXYNOS_MIPI_DSIM
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index c5df03a9f54db737d51ee1aeaea2b15f59d2af3a..20bd116c9e3d0d5a5e9c69c0b46f27894452305b 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -140,7 +140,6 @@
 
 /* LCD */
 #define CONFIG_FB_ADDR         0x52504000
-#define CONFIG_EXYNOS_MIPI_DSIM
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */