mtd: pxa3xx_nand: Correct null dereference

[u-boot] / drivers / video / Kconfig

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 9ecfeaea50db1c0bdf88086514aa7fcbd422b177..19f9429cce784450d5fbcea2d9d114638ebf3ed9 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -44,7 +44,17 @@ config VIDEO_BPP32
          this option, such displays will not be supported and console output
          will be empty.
 
-config VIDEO_ROTATION
+config CONSOLE_NORMAL
+       bool "Support a simple text console"
+       depends on DM_VIDEO
+       default y if DM_VIDEO
+       help
+         Support drawing text on the frame buffer console so that it can be
+         used as a console. Rotation is not supported by this driver (see
+         CONFIG_CONSOLE_ROTATION for that). A built-in 8x16 font is used
+         for the display.
+
+config CONSOLE_ROTATION
        bool "Support rotated displays"
        depends on DM_VIDEO
        help
@@ -57,6 +67,40 @@ config VIDEO_ROTATION
          struct video_priv: 0=unrotated, 1=90 degrees clockwise, 2=180
          degrees, 3=270 degrees.
 
+config CONSOLE_TRUETYPE
+       bool "Support a console that uses TrueType fonts"
+       depends on DM_VIDEO
+       help
+         TrueTrype fonts can provide outline-drawing capability rather than
+         needing to provide a bitmap for each font and size that is needed.
+         With this option you can adjust the text size and use a variety of
+         fonts. Note that this is noticeably slower than with normal console.
+
+config CONSOLE_TRUETYPE_SIZE
+       int "TrueType font size"
+       depends on CONSOLE_TRUETYPE
+       default 18
+       help
+         This sets the font size for the console. The size is measured in
+         pixels and is the nominal height of a character. Note that fonts
+         are commonly measured in 'points', being 1/72 inch (about 3.52mm).
+         However that measurement depends on the size of your display and
+         there is no standard display density. At present there is not a
+         method to select the display's physical size, which would allow
+         U-Boot to calculate the correct font size.
+
+source "drivers/video/fonts/Kconfig"
+
+config VIDCONSOLE_AS_LCD
+       bool "Use 'vidconsole' when 'lcd' is seen in stdout"
+       depends on DM_VIDEO
+       help
+         This is a work-around for boards which have 'lcd' in their stdout
+         environment variable, but have moved to use driver model for video.
+         In this case the console will no-longer work. While it is possible
+         to update the environment, the breakage may be confusing for users.
+         This option will be removed around the end of 2016.
+
 config VIDEO_VESA
        bool "Enable VESA video driver support"
        default n
@@ -293,16 +337,41 @@ 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 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 y
+       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