Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 499d00d57e6e1f39d4bf271c2bdb13d94d8f7839..f54631cc17288e790a65e11610c344d7edbc7031 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -293,12 +293,49 @@ config VIDEO_LCD_SPI_MISO
        option takes a string in the format understood by 'name_to_gpio'
        function, e.g. PH1 for pin 1 of port H.
 
-config DISPLAY_PORT
-       bool "Enable DisplayPort support"
+config VIDEO_MVEBU
+       bool "Armada XP LCD controller"
+       default n
+       ---help---
+       Support for the LCD controller integrated in the Marvell
+       Armada XP SoC.
+
+config I2C_EDID
+       bool "Enable EDID library"
+       depends on DM_I2C
+       default n
+       help
+          This enables library for accessing EDID data from an LCD panel.
+
+config DISPLAY
+       bool "Enable Display support"
+       depends on DM
+       default n
+       select I2C_EDID
+       help
+          This supports drivers that provide a display, such as eDP (Embedded
+          DisplayPort) and HDMI (High Definition Multimedia Interface).
+          The devices provide a simple interface to start up the display,
+          read display information and enable it.
+
+config VIDEO_ROCKCHIP
+       bool "Enable Rockchip video support"
+       depends on DM_VIDEO
+       help
+          Rockchip SoCs provide video output capabilities for High-Definition
+          Multimedia Interface (HDMI), Low-voltage Differential Signalling
+          (LVDS), embedded DisplayPort (eDP) and Display Serial Interface
+          (DSI). This driver supports the on-chip video output device, and
+          targets the Rockchip RK3288.
+
+config VIDEO_SANDBOX_SDL
+       bool "Enable sandbox video console using SDL"
+       depends on SANDBOX
        help
-          eDP (Embedded DisplayPort) is a standard widely used in laptops
-          to drive LCD panels. This framework provides support for enabling
-          these displays where supported by the video hardware.
+         When using sandbox you can enable an emulated LCD display which
+         appears as an SDL (Simple DirectMedia Layer) window. This is a
+         console device and can display stdout output. Within U-Boot is is
+         a normal bitmap display and can display images as well as text.
 
 config VIDEO_TEGRA124
        bool "Enable video support on Tegra124"