From 7588c312528eea9e24ef5c1b9a29a256ac5024d4 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Mon, 25 Jan 2016 17:17:22 +0100 Subject: 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 Reported-by: Bin Meng Cc: Simon Glass Reviewed-by: Tom Rini Reviewed-by: Simon Glass Tested-by: Bin Meng Signed-off-by: Anatolij Gustschin --- include/configs/chromebook_jerry.h | 1 - include/configs/firefly-rk3288.h | 1 - include/configs/nyan-big.h | 2 -- include/configs/rock2.h | 1 - 4 files changed, 5 deletions(-) (limited to 'include') diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index 150e876..67f45c0 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 d6423e7..a29f557 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 9464153..176f6e9 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 d6423e7..a29f557 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 -- cgit v1.1