Commit 7588c312 authored by Anatolij Gustschin's avatar Anatolij Gustschin

video: add CONFIG_I2C_EDID and disable CONFIG_DISPLAY by default

Enabling CONFIG_DISPLAY breaks building for some architectures
(microblaze-generic), so we disable CONFIG_DISPLAY in Kconfig
by default and enable this option in defconfigs. CONFIG_DISPLAY
depends on CONFIG_I2C_EDID, so add and enable it in defconfigs, too.
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
Reported-by: default avatarBin Meng <bmeng.cn@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: default avatarTom Rini <trini@konsulko.com>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
Tested-by: default avatarBin Meng <bmeng.cn@gmail.com>
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
parent e32951b5
...@@ -55,6 +55,8 @@ CONFIG_DEBUG_UART_SHIFT=2 ...@@ -55,6 +55,8 @@ CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_ROCKCHIP_SPI=y CONFIG_ROCKCHIP_SPI=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_I2C_EDID=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROTATION=y
CONFIG_VIDEO_ROCKCHIP=y CONFIG_VIDEO_ROCKCHIP=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
......
...@@ -47,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000 ...@@ -47,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_I2C_EDID=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROTATION=y
CONFIG_VIDEO_ROCKCHIP=y CONFIG_VIDEO_ROCKCHIP=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
......
...@@ -26,6 +26,7 @@ CONFIG_TPM_TIS_INFINEON=y ...@@ -26,6 +26,7 @@ CONFIG_TPM_TIS_INFINEON=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_DISPLAY=y CONFIG_DISPLAY=y
CONFIG_I2C_EDID=y
CONFIG_VIDEO_TEGRA124=y CONFIG_VIDEO_TEGRA124=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
CONFIG_TPM=y CONFIG_TPM=y
...@@ -45,6 +45,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000 ...@@ -45,6 +45,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_I2C_EDID=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROTATION=y
CONFIG_VIDEO_ROCKCHIP=y CONFIG_VIDEO_ROCKCHIP=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
......
...@@ -300,10 +300,18 @@ config VIDEO_MVEBU ...@@ -300,10 +300,18 @@ config VIDEO_MVEBU
Support for the LCD controller integrated in the Marvell Support for the LCD controller integrated in the Marvell
Armada XP SoC. 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 config DISPLAY
bool "Enable Display support" bool "Enable Display support"
depends on DM depends on DM
default y default n
select I2C_EDID
help help
This supports drivers that provide a display, such as eDP (Embedded This supports drivers that provide a display, such as eDP (Embedded
DisplayPort) and HDMI (High Definition Multimedia Interface). DisplayPort) and HDMI (High Definition Multimedia Interface).
......
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_POWER_SUPPORT
#define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_I2C_SUPPORT
#define CONFIG_I2C_EDID
#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_CONSOLE_SCROLL_LINES 10 #define CONFIG_CONSOLE_SCROLL_LINES 10
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
*/ */
#define CONFIG_ENV_OFFSET (96 * 1024) #define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_I2C_EDID
#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_CONSOLE_SCROLL_LINES 10 #define CONFIG_CONSOLE_SCROLL_LINES 10
......
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_SYS_MMC_ENV_PART 2
#define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE)
#define CONFIG_I2C_EDID
/* LCD support */ /* LCD support */
#define CONFIG_LCD #define CONFIG_LCD
#define CONFIG_PWM_TEGRA #define CONFIG_PWM_TEGRA
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
*/ */
#define CONFIG_ENV_OFFSET (96 * 1024) #define CONFIG_ENV_OFFSET (96 * 1024)
#define CONFIG_I2C_EDID
#define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_SYS_WHITE_ON_BLACK
#define CONFIG_CONSOLE_SCROLL_LINES 10 #define CONFIG_CONSOLE_SCROLL_LINES 10
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment