diff options
| author | Anatolij Gustschin | 2016-01-25 17:17:22 +0100 |
|---|---|---|
| committer | Anatolij Gustschin | 2016-01-26 08:06:13 +0100 |
| commit | 7588c312528eea9e24ef5c1b9a29a256ac5024d4 (patch) | |
| tree | f1b2c0ef0119837730556447e1608d6477add1a2 | |
| parent | e32951b525c5cd67aece0dffb7d4012b1567dcaf (diff) | |
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: Anatolij Gustschin <agust@denx.de>
Reported-by: Bin Meng <bmeng.cn@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
| -rw-r--r-- | configs/chromebook_jerry_defconfig | 2 | ||||
| -rw-r--r-- | configs/firefly-rk3288_defconfig | 2 | ||||
| -rw-r--r-- | configs/nyan-big_defconfig | 1 | ||||
| -rw-r--r-- | configs/rock2_defconfig | 2 | ||||
| -rw-r--r-- | drivers/video/Kconfig | 10 | ||||
| -rw-r--r-- | include/configs/chromebook_jerry.h | 1 | ||||
| -rw-r--r-- | include/configs/firefly-rk3288.h | 1 | ||||
| -rw-r--r-- | include/configs/nyan-big.h | 2 | ||||
| -rw-r--r-- | include/configs/rock2.h | 1 |
9 files changed, 16 insertions, 6 deletions
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 27e53c14c6c..bd8b9649ced 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -55,6 +55,8 @@ CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_ROCKCHIP_SPI=y CONFIG_DM_VIDEO=y +CONFIG_I2C_EDID=y +CONFIG_DISPLAY=y CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index 15eb4d87b9f..3b29158f4ac 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -47,6 +47,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_DM_VIDEO=y +CONFIG_I2C_EDID=y +CONFIG_DISPLAY=y CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index 03348a6987a..ca0f9e067bf 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -26,6 +26,7 @@ CONFIG_TPM_TIS_INFINEON=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_DISPLAY=y +CONFIG_I2C_EDID=y CONFIG_VIDEO_TEGRA124=y CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_TPM=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 2563775c6b7..68e3b367a33 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -45,6 +45,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_DM_VIDEO=y +CONFIG_I2C_EDID=y +CONFIG_DISPLAY=y CONFIG_VIDEO_ROTATION=y CONFIG_VIDEO_ROCKCHIP=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4e706b7058e..f54631cc172 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -300,10 +300,18 @@ config VIDEO_MVEBU 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). diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index 150e8765d64..67f45c0f908 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -30,7 +30,6 @@ #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_I2C_SUPPORT -#define CONFIG_I2C_EDID #define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index d6423e7e554..a29f55709dd 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -24,7 +24,6 @@ */ #define CONFIG_ENV_OFFSET (96 * 1024) -#define CONFIG_I2C_EDID #define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 9464153f584..176f6e902b3 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -37,8 +37,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) -#define CONFIG_I2C_EDID - /* LCD support */ #define CONFIG_LCD #define CONFIG_PWM_TEGRA diff --git a/include/configs/rock2.h b/include/configs/rock2.h index d6423e7e554..a29f55709dd 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -24,7 +24,6 @@ */ #define CONFIG_ENV_OFFSET (96 * 1024) -#define CONFIG_I2C_EDID #define CONFIG_SYS_WHITE_ON_BLACK #define CONFIG_CONSOLE_SCROLL_LINES 10 |